[gtk+/gtk-2.90] Don't include gdkwin32.h when testing Objective-C++
- From: Christian Dywan <cdywan src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2.90] Don't include gdkwin32.h when testing Objective-C++
- Date: Fri, 16 Oct 2009 13:54:52 +0000 (UTC)
commit 00a1ba2962b90d5abe8bcf5a98baff9ae7d8e237
Author: Tor Lillqvist <tml iki fi>
Date: Fri Oct 9 14:32:11 2009 +0300
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.
tests/autotestkeywords.cc | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/tests/autotestkeywords.cc b/tests/autotestkeywords.cc
index 73f20c3..28b1d24 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]