Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux followup to bug 583053 - fix the include ordering so that KeyPress is defined at the time we need it.

Browse Source
This commit is contained in:
Benjamin Smedberg 2010-08-16 11:41:46 -04:00
parent 2afbd46dc1
commit 9b333fdb92
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/generic/nsObjectFrame.cpp
View File

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