From 93c072b7247528701e67eb00ae49bef5fc2e188c Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Thu, 23 Sep 2010 21:54:52 -0500
Subject: [PATCH] Followup to bug 597336: fix --disable-ipc builds. a=bustage

---
 widget/src/gtk2/nsWindow.cpp |  7 +------
 widget/src/gtk2/nsWindow.h   | 10 +++++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index f70ed2985fd3..a9fd33986fe5 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -43,10 +43,6 @@
 #define MAEMO_CHANGES
 #endif
 
-#ifdef MOZ_IPC
-#  include "mozilla/ipc/SharedMemorySysV.h"
-#endif
-
 #include "prlink.h"
 
 #include "nsWindow.h"
@@ -393,8 +389,7 @@ protected:
 };
 
 
-#if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
-#  define MOZ_HAVE_SHMIMAGE
+#ifdef MOZ_HAVE_SHMIMAGE
 
 using mozilla::ipc::SharedMemorySysV;
 
diff --git a/widget/src/gtk2/nsWindow.h b/widget/src/gtk2/nsWindow.h
index 7dbddb08acbd..f93a430a4790 100644
--- a/widget/src/gtk2/nsWindow.h
+++ b/widget/src/gtk2/nsWindow.h
@@ -40,6 +40,10 @@
 #ifndef __nsWindow_h__
 #define __nsWindow_h__
 
+#ifdef MOZ_IPC
+#  include "mozilla/ipc/SharedMemorySysV.h"
+#endif
+
 #include "nsAutoPtr.h"
 
 #include "mozcontainer.h"
@@ -97,7 +101,11 @@ extern PRLogModuleInfo *gWidgetDrawLog;
 
 #endif /* MOZ_LOGGING */
 
+#if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
+#  define MOZ_HAVE_SHMIMAGE
+
 class nsShmImage;
+#endif
 
 class nsWindow : public nsBaseWidget, public nsSupportsWeakReference
 {
@@ -403,7 +411,7 @@ private:
     PRInt32             mTransparencyBitmapWidth;
     PRInt32             mTransparencyBitmapHeight;
 
-#ifdef MOZ_X11
+#ifdef MOZ_HAVE_SHMIMAGE
     // If we're using xshm rendering, mThebesSurface wraps mShmImage
     nsRefPtr<nsShmImage>  mShmImage;
 #endif