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*/
 	}