bug 195897 - fix compiling on aix

1 files changed, 15 insertions, 10 deletions

diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseNix.c b/bundles/org.eclipse.equinox.executable/library/eclipseNix.c
index cdbc29699..a078101d5 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipseNix.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipseNix.c
@@ -174,17 +174,19 @@ int startJavaVM( _TCHAR* libPath, _TCHAR* vmArgs[], _TCHAR* progArgs[], _TCHAR*
 }
 
 int isSunVM( _TCHAR * javaVM, _TCHAR * jniLib ) {
+	int descriptors[2];
+	int result = 0;
+	int pid = -1;
+	
 	if (javaVM == NULL)
 		return 0;
 	
-	int descriptors[2];
-	int result = 0;
 	/* create pipe, [0] is read end, [1] is write end */
 	if (pipe(descriptors) != 0)
 		return 0; /* error */
 	
-	int pid = fork();
-	if (pid == 0 ) { 
+	pid = fork();
+	if (pid == 0 ) {
 		/* child, connect stdout & stderr to write end of the pipe*/
 		dup2(descriptors[1], STDERR_FILENO);
 		dup2(descriptors[1], STDOUT_FILENO);
@@ -193,15 +195,18 @@ int isSunVM( _TCHAR * javaVM, _TCHAR * jniLib ) {
 		close(descriptors[0]);
 		close(descriptors[1]);
 		
-		/* exec java -version */
-		_TCHAR *args [] = { javaVM, _T_ECLIPSE("-version"), NULL };
-		execv(args[0], args);
-		/* if we make it here, there was a problem with exec, just exit */
-		exit(0);
+		{
+			/* exec java -version */
+			_TCHAR *args [] = { javaVM, _T_ECLIPSE("-version"), NULL };
+			execv(args[0], args);
+			/* if we make it here, there was a problem with exec, just exit */
+			exit(0);
+		}
 	} else if (pid > 0){
 		/* parent */
+		FILE * stream = NULL;
 		close(descriptors[1]);
-		FILE * stream = fdopen( descriptors[0], "r");
+		stream = fdopen( descriptors[0], "r");
 		if (stream != NULL) {
 			_TCHAR buffer[256];
 			while ( fgets(buffer, 256, stream) != NULL) {