summaryrefslogtreecommitdiff
path: root/tests/autotestkeywords.cc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2009-10-09 14:32:11 +0300
committerTor Lillqvist <tml@iki.fi>2009-10-09 14:35:49 +0300
commit2e0b5580efb217586b5ac74d4cfdf2db5125006e (patch)
tree704a9c002abb4a646d0d1004942a9cd45330107d /tests/autotestkeywords.cc
parent088baaec31705d2efa6e66d7ab14139c154320c2 (diff)
downloadgtk+-2e0b5580efb217586b5ac74d4cfdf2db5125006e.tar.gz
Don't include gdkwin32.h when testing Objective-C++
Fixes bug #594644. If somebody actually some day needs to include gdkwin32.h from an Objective-C++ program something needs to be done.
Diffstat (limited to 'tests/autotestkeywords.cc')
-rw-r--r--tests/autotestkeywords.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/autotestkeywords.cc b/tests/autotestkeywords.cc
index 73f20c3e1b..28b1d24bac 100644
--- a/tests/autotestkeywords.cc
+++ b/tests/autotestkeywords.cc
@@ -18,6 +18,7 @@
#endif
#endif
+#ifndef __OBJC__
#ifdef GDK_WINDOWING_WIN32
#define gdk_display gdk_display_win32
#include <gdk/win32/gdkwin32.h>
@@ -25,6 +26,7 @@
#undef GDK_DISPLAY
#undef GDK_ROOT_WINDOW
#endif
+#endif
#ifdef GDK_WINDOWING_X11
#define gdk_display gdk_display_x11