Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2007-03-17 19:41:37 +0000
committerAndrew Niefer2007-03-17 19:41:37 +0000
commit190593d2024aa9deed24beeceaa591dd329b04b8 (patch)
tree57d60cec7f7054dd3a1b9eb1ff88e54d44064c0f /bundles/org.eclipse.equinox.executable/library/motif
parenta00c302e7e58e8e6ada541679f1ef5e2a56fe74b (diff)
downloadrt.equinox.framework-190593d2024aa9deed24beeceaa591dd329b04b8.tar.gz
rt.equinox.framework-190593d2024aa9deed24beeceaa591dd329b04b8.tar.xz
rt.equinox.framework-190593d2024aa9deed24beeceaa591dd329b04b8.zip
fix splash teardown crash on motifv20070318a
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/motif')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c3
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak2
2 files changed, 2 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
index 3596347b8..7514338f4 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
+++ b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
@@ -79,7 +79,6 @@ void takeDownSplashCB( Widget shell, XtPointer app_data, XtPointer widget_data )
*/
int showSplash( const char* featureImage )
{
- int argc = 0;
int x, y;
unsigned int width, height, depth, border;
ArgList args;
@@ -213,7 +212,7 @@ void takeDownSplash()
if (shellHandle != 0)
{
XtDestroyWidget( shellHandle );
- XFlush( XtDisplay( shellHandle ) );
+ /*XFlush( XtDisplay( shellHandle ) );*/
shellHandle = NULL;
}
}
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
index c0ff91255..668ee436e 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
@@ -44,7 +44,7 @@ EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
LIBS = -Xlinker -rpath -Xlinker . -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11 -lXinerama -lpthread
LFLAGS = -shared -fpic -Wl,--export-dynamic
-CFLAGS = -g -s -Wall \
+CFLAGS = -O -s -Wall \
-DLINUX \
-DMOTIF \
-DMOZILLA_FIX \

Back to the top