Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2006-12-12 23:36:49 +0000
committerAndrew Niefer2006-12-12 23:36:49 +0000
commit0f8b67164b60066bf3d7141e5796b7867dfdb16f (patch)
tree60cf639659b006ac62951a4c651aed87719edb5b /bundles/org.eclipse.equinox.executable
parent712c60d9864e4fb996803e6a0818bb07c52a1807 (diff)
downloadrt.equinox.framework-0f8b67164b60066bf3d7141e5796b7867dfdb16f.tar.gz
rt.equinox.framework-0f8b67164b60066bf3d7141e5796b7867dfdb16f.tar.xz
rt.equinox.framework-0f8b67164b60066bf3d7141e5796b7867dfdb16f.zip
fixes for compiling on Solaris
Diffstat (limited to 'bundles/org.eclipse.equinox.executable')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipseCommon.c4
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipseJNI.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseCommon.c b/bundles/org.eclipse.equinox.executable/library/eclipseCommon.c
index 400e39cf0..f418be57b 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipseCommon.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipseCommon.c
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <string.h>
#include <dirent.h>
+#include <limits.h>
#endif
#include <stdlib.h>
#include <sys/stat.h>
@@ -195,7 +196,8 @@ char * resolveSymlinks( char * path ) {
return path;
/* resolve symlinks */
char * ch = path;
- path = canonicalize_file_name(path);
+ char * buffer = malloc(PATH_MAX);
+ path = realpath(path, buffer);
free(ch);
return path;
}
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c b/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
index cd691be18..69572a839 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
@@ -189,8 +189,8 @@ int startJavaVM( _TCHAR* libPath, _TCHAR* vmArgs[], _TCHAR* progArgs[] )
if(jniLibrary == NULL) {
return -1; /*error*/
}
-
- createJavaVM = findSymbol(jniLibrary, _T_ECLIPSE("JNI_CreateJavaVM"));
+
+ createJavaVM = (JNI_createJavaVM)findSymbol(jniLibrary, _T_ECLIPSE("JNI_CreateJavaVM"));
if(createJavaVM == NULL) {
return -1; /*error*/
}

Back to the top