mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
Linux followup to bug 583053 - fix the include ordering so that KeyPress is defined at the time we need it.
This commit is contained in:
parent
2afbd46dc1
commit
9b333fdb92
@ -50,6 +50,15 @@
|
||||
#include "mozilla/plugins/PluginMessageUtils.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_X11
|
||||
#include <cairo-xlib.h>
|
||||
#include "gfxXlibSurface.h"
|
||||
/* X headers suck */
|
||||
enum { XKeyPress = KeyPress };
|
||||
#ifdef KeyPress
|
||||
#undef KeyPress
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_WIDGET_QT
|
||||
#include <QWidget>
|
||||
#include <QKeyEvent>
|
||||
@ -172,15 +181,6 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
|
||||
#include "nsCoreAnimationSupport.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_X11
|
||||
#include <cairo-xlib.h>
|
||||
#include "gfxXlibSurface.h"
|
||||
/* X headers suck */
|
||||
enum { XKeyPress = KeyPress };
|
||||
#ifdef KeyPress
|
||||
#undef KeyPress
|
||||
#endif
|
||||
|
||||
#if (MOZ_PLATFORM_MAEMO == 5) && defined(MOZ_WIDGET_GTK2)
|
||||
#define MOZ_COMPOSITED_PLUGINS 1
|
||||
#define MOZ_USE_IMAGE_EXPOSE 1
|
||||
|
Loading…
Reference in New Issue
Block a user