[gtk+] Tweak include order a bit to get around compilation errors
- From: Tor Lillqvist <tml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Tweak include order a bit to get around compilation errors
- Date: Sun, 20 Feb 2011 22:00:34 +0000 (UTC)
commit acc01ac944e60be483801469094d25cefdb0d1b7
Author: Tor Lillqvist <tml iki fi>
Date: Sun Feb 20 23:54:57 2011 +0200
Tweak include order a bit to get around compilation errors
wintab.h defines an INT() macro that interfers with some lines in
commctrl.h.
gdk/win32/gdkdevicemanager-win32.c | 5 +----
gdk/win32/gdkevents-win32.c | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index 1af9039..19ae866 100644
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -24,17 +24,14 @@
#include <math.h>
#include <gdk/gdk.h>
+#include "gdkwin32.h"
#include "gdkprivate-win32.h"
#include "gdkdevicemanager-win32.h"
#include "gdkdeviceprivate.h"
#include "gdkdevice-win32.h"
#include "gdkdevice-wintab.h"
-#include "gdkwin32.h"
#include "gdkdisplayprivate.h"
-#include <windows.h>
-#include <wintab.h>
-
#define WINTAB32_DLL "Wintab32.dll"
#define PACKETDATA (PK_CONTEXT | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION)
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index eaacd01..cc7343c 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -48,11 +48,11 @@
#include "gdk.h"
#include "gdkdisplayprivate.h"
#include "gdkprivate-win32.h"
+#include "gdkwin32.h"
#include "gdkkeysyms.h"
#include "gdkdevicemanager-win32.h"
#include "gdkdeviceprivate.h"
#include "gdkdevice-wintab.h"
-#include "gdkwin32.h"
#include "gdkwin32dnd.h"
#include "gdkdndprivate.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]