Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2008-06-06 14:17:08 -0400
committerAndrew Niefer2008-06-06 14:17:08 -0400
commit9b197326dbba76adf99d6992406229e2caf78180 (patch)
tree7d146d2704570127634702e02c44d8025b496311 /bundles
parentb1617df28b5ce034b7724924c49a062061e9aee0 (diff)
downloadrt.equinox.framework-9b197326dbba76adf99d6992406229e2caf78180.tar.gz
rt.equinox.framework-9b197326dbba76adf99d6992406229e2caf78180.tar.xz
rt.equinox.framework-9b197326dbba76adf99d6992406229e2caf78180.zip
bug 235954 - Eclipse launcher exits immediately on linuxv20080606R3_4
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipseNix.c5
-rw-r--r--bundles/org.eclipse.equinox.executable/library/make_version.mak2
2 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseNix.c b/bundles/org.eclipse.equinox.executable/library/eclipseNix.c
index a078101d5..e3c37cec3 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipseNix.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipseNix.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/wait.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -205,6 +206,7 @@ int isSunVM( _TCHAR * javaVM, _TCHAR * jniLib ) {
} else if (pid > 0){
/* parent */
FILE * stream = NULL;
+ int status = 0;
close(descriptors[1]);
stream = fdopen( descriptors[0], "r");
if (stream != NULL) {
@@ -222,6 +224,7 @@ int isSunVM( _TCHAR * javaVM, _TCHAR * jniLib ) {
fclose(stream);
close(descriptors[0]);
}
+ waitpid(pid, &status, 0);
} else {
/* failed to fork */
close(descriptors[0]);
diff --git a/bundles/org.eclipse.equinox.executable/library/make_version.mak b/bundles/org.eclipse.equinox.executable/library/make_version.mak
index 28addfcc8..697d14787 100644
--- a/bundles/org.eclipse.equinox.executable/library/make_version.mak
+++ b/bundles/org.eclipse.equinox.executable/library/make_version.mak
@@ -10,5 +10,5 @@
#*******************************************************************************
maj_ver=1
-min_ver=114
+min_ver=114b
LIB_VERSION = $(maj_ver)$(min_ver)

Back to the top