Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed2001-10-30 17:37:25 -0500
committerGrant Gayed2001-10-30 17:37:25 -0500
commitead25a4552e23771cc98274df26ef8d9146de188 (patch)
treee0c9ebfc18335858a8128a450d15e14cf3f41106 /bundles/org.eclipse.swt/Eclipse SWT/motif/library
parentbf0a4e1050771ff149803266ff240ed1e0eb6d68 (diff)
downloadeclipse.platform.swt-ead25a4552e23771cc98274df26ef8d9146de188.tar.gz
eclipse.platform.swt-ead25a4552e23771cc98274df26ef8d9146de188.tar.xz
eclipse.platform.swt-ead25a4552e23771cc98274df26ef8d9146de188.zip
*** empty log message ***
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/motif/library')
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak5
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c4
3 files changed, 5 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh
index 600fde3629..52bc02a4e3 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh
@@ -10,7 +10,7 @@
# calls so java can query the swt shared library version number
setenv MAJOR_VER 2
-setenv MINOR_VER 10
+setenv MINOR_VER 010
setenv BUILD_NUM 0
# Some UNIX/Linux compilers don't like <CR>'s in files (DOS format).
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak
index bb8b88c62a..717089e03d 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak
@@ -9,7 +9,7 @@
# MINOR_VER - the minor version number
# BUILD_NUM - the build number
-DLL_VERSION=$(MAJOR_VER)0$(MINOR_VER)
+DLL_VERSION=$(MAJOR_VER)$(MINOR_VER)
# Define the installation directories for various products.
@@ -47,8 +47,7 @@ KDE_LIB = -L/usr/lib -L$(QT_HOME)/lib \
# library. The KDE library uses its own (C++) flags.
#
CFLAGS = -O -s \
- -DSWT_LIBRARY_MAJOR_VERSION=$(MAJOR_VER) \
- -DSWT_LIBRARY_MINOR_VERSION=$(MINOR_VER) \
+ -DSWT_LIBRARY_VERSION=$(MAJOR_VER)$(MINOR_VER) \
-DLINUX -DMOTIF -DGNOME \
-fpic \
-I./ \
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c
index 361c762ebb..2f31f3ca83 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c
@@ -25,7 +25,7 @@ JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_motif_OS_getSharedLibraryMaj
#ifdef DEBUG_CALL_PRINTS
fprintf(stderr, "getSharedLibraryMajorVersionNumber\n");
#endif
- return SWT_LIBRARY_MAJOR_VERSION;
+ return SWT_LIBRARY_VERSION / 1000;
}
JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_motif_OS_getSharedLibraryMinorVersionNumber
@@ -34,7 +34,7 @@ JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_motif_OS_getSharedLibraryMin
#ifdef DEBUG_CALL_PRINTS
fprintf(stderr, "getSharedLibraryMinorVersionNumber\n");
#endif
- return SWT_LIBRARY_MINOR_VERSION;
+ return SWT_LIBRARY_VERSION % 1000;
}

Back to the top