Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2008-07-28 14:28:29 -0400
committerAndrew Niefer2008-07-28 14:28:29 -0400
commit5db109c8327222b9c90b3bf5e5015fa439c84eac (patch)
tree35e5d71c5394532c7b97c98c60ac31c6ee8c26d1
parent5c3a8d6210398311bf8b4298da29fbf54ee04b30 (diff)
downloadrt.equinox.framework-5db109c8327222b9c90b3bf5e5015fa439c84eac.tar.gz
rt.equinox.framework-5db109c8327222b9c90b3bf5e5015fa439c84eac.tar.xz
rt.equinox.framework-5db109c8327222b9c90b3bf5e5015fa439c84eac.zip
bug 236091 - wait on pid
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c2
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c b/bundles/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c
index cbae915ba..343aeb343 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c
@@ -174,7 +174,7 @@ int launchJavaVM( char* args[] )
/* If the JVM is still running, wait for it to terminate. */
if (jvmProcess != 0)
{
- wait(&exitCode);
+ waitpid(jvmProcess, &exitCode, 0);
if (WIFEXITED(exitCode))
jvmExitCode = WEXITSTATUS(exitCode);
}
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
index afd3dbbce..6bdc37ad0 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
+++ b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
@@ -316,7 +316,7 @@ int launchJavaVM( char* args[] )
/* If the JVM is still running, wait for it to terminate. */
if (jvmProcess != 0)
{
- wait( &exitCode );
+ waitpid(jvmExitCode, &exitCode, 0);
jvmExitCode = ((exitCode & 0x00ff) == 0 ? (exitCode >> 8) : exitCode); /* see wait(2) */
}

Back to the top