Followup to bug 597336: fix --disable-ipc builds. a=bustage

This commit is contained in:
Chris Jones 2010-09-23 21:54:52 -05:00
parent 8dfd8a9673
commit fa67eeb79b
2 changed files with 10 additions and 7 deletions

View File

@ -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;

View File

@ -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