зеркало из https://github.com/mozilla/gecko-dev.git
Followup to bug 597336: fix --disable-ipc builds. a=bustage
This commit is contained in:
Родитель
1d476dff30
Коммит
93c072b724
|
@ -43,10 +43,6 @@
|
||||||
#define MAEMO_CHANGES
|
#define MAEMO_CHANGES
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MOZ_IPC
|
|
||||||
# include "mozilla/ipc/SharedMemorySysV.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "prlink.h"
|
#include "prlink.h"
|
||||||
|
|
||||||
#include "nsWindow.h"
|
#include "nsWindow.h"
|
||||||
|
@ -393,8 +389,7 @@ protected:
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
|
#ifdef MOZ_HAVE_SHMIMAGE
|
||||||
# define MOZ_HAVE_SHMIMAGE
|
|
||||||
|
|
||||||
using mozilla::ipc::SharedMemorySysV;
|
using mozilla::ipc::SharedMemorySysV;
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,10 @@
|
||||||
#ifndef __nsWindow_h__
|
#ifndef __nsWindow_h__
|
||||||
#define __nsWindow_h__
|
#define __nsWindow_h__
|
||||||
|
|
||||||
|
#ifdef MOZ_IPC
|
||||||
|
# include "mozilla/ipc/SharedMemorySysV.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "nsAutoPtr.h"
|
#include "nsAutoPtr.h"
|
||||||
|
|
||||||
#include "mozcontainer.h"
|
#include "mozcontainer.h"
|
||||||
|
@ -97,7 +101,11 @@ extern PRLogModuleInfo *gWidgetDrawLog;
|
||||||
|
|
||||||
#endif /* MOZ_LOGGING */
|
#endif /* MOZ_LOGGING */
|
||||||
|
|
||||||
|
#if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
|
||||||
|
# define MOZ_HAVE_SHMIMAGE
|
||||||
|
|
||||||
class nsShmImage;
|
class nsShmImage;
|
||||||
|
#endif
|
||||||
|
|
||||||
class nsWindow : public nsBaseWidget, public nsSupportsWeakReference
|
class nsWindow : public nsBaseWidget, public nsSupportsWeakReference
|
||||||
{
|
{
|
||||||
|
@ -403,7 +411,7 @@ private:
|
||||||
PRInt32 mTransparencyBitmapWidth;
|
PRInt32 mTransparencyBitmapWidth;
|
||||||
PRInt32 mTransparencyBitmapHeight;
|
PRInt32 mTransparencyBitmapHeight;
|
||||||
|
|
||||||
#ifdef MOZ_X11
|
#ifdef MOZ_HAVE_SHMIMAGE
|
||||||
// If we're using xshm rendering, mThebesSurface wraps mShmImage
|
// If we're using xshm rendering, mThebesSurface wraps mShmImage
|
||||||
nsRefPtr<nsShmImage> mShmImage;
|
nsRefPtr<nsShmImage> mShmImage;
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче