Bustage fix of the bustage fix, bug 583053.
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 16 Aug 2010 12:38:43 -0400
changeset 50671 e9089b5e4a37df50d2bfd408bcf58123ea6f803e
parent 50670 099d6c0a511cd9eb2a0cfe1ced02632ace4d7919
child 50672 903b6e5087a0f7a4080a0eddaeeaf67094870e08
push idunknown
push userunknown
push dateunknown
bugs583053
milestone2.0b4pre
Bustage fix of the bustage fix, bug 583053.
layout/generic/nsObjectFrame.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -53,16 +53,17 @@
 #ifdef MOZ_X11
 #include <cairo-xlib.h>
 #include "gfxXlibSurface.h"
 /* X headers suck */
 enum { XKeyPress = KeyPress };
 #ifdef KeyPress
 #undef KeyPress
 #endif
+#endif
 
 #ifdef MOZ_WIDGET_QT
 #include <QWidget>
 #include <QKeyEvent>
 #ifdef MOZ_X11
 #include <QX11Info>
 #endif
 #endif
@@ -176,16 +177,17 @@ static NS_DEFINE_CID(kRangeCID, NS_RANGE
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
 
 #ifdef XP_MACOSX
 #include "gfxQuartzNativeDrawing.h"
 #include "nsPluginUtilsOSX.h"
 #include "nsCoreAnimationSupport.h"
 #endif
 
+#ifdef MOZ_X11
 #if (MOZ_PLATFORM_MAEMO == 5) && defined(MOZ_WIDGET_GTK2)
 #define MOZ_COMPOSITED_PLUGINS 1
 #define MOZ_USE_IMAGE_EXPOSE   1
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XShm.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>