From 154c4aa11315e65a3b788e633097c668b2b91b09 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 30 Jul 1999 17:02:44 +0000 Subject: [PATCH] explicit compilation fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/utilsgtk.cpp | 11 ++++------- src/gtk1/utilsgtk.cpp | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 1675dfe547..5f563ac295 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -30,17 +30,14 @@ #include "gdk/gdkx.h" #ifdef HAVE_X11_XKBLIB_H - #ifdef __HPUX__ - /* under HP-UX XKBlib.h defines structures with field named "explicit" - - * which is, of course, an error for a C++ compiler */ + /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with + * field named "explicit" - which is, of course, an error for a C++ + * compiler. To be on the safe side, just redefine it everywhere. */ #define explicit __wx_explicit - #endif - #include "X11/XKBlib.h" + #include "X11/XKBlib.h" - #ifdef __HPUX__ #undef explicit - #endif // __HPUX__ #endif // HAVE_X11_XKBLIB_H // ---------------------------------------------------------------------------- diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index 1675dfe547..5f563ac295 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -30,17 +30,14 @@ #include "gdk/gdkx.h" #ifdef HAVE_X11_XKBLIB_H - #ifdef __HPUX__ - /* under HP-UX XKBlib.h defines structures with field named "explicit" - - * which is, of course, an error for a C++ compiler */ + /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with + * field named "explicit" - which is, of course, an error for a C++ + * compiler. To be on the safe side, just redefine it everywhere. */ #define explicit __wx_explicit - #endif - #include "X11/XKBlib.h" + #include "X11/XKBlib.h" - #ifdef __HPUX__ #undef explicit - #endif // __HPUX__ #endif // HAVE_X11_XKBLIB_H // ---------------------------------------------------------------------------- -- 2.47.2