explicit compilation fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 1675dfe547b0ebf44790392f5a5e8ce906c2b5d6..5f563ac295e73b4ac21ca1f461226ed38d4d3101 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -30,17 +30,14 @@
 #include "gdk/gdkx.h"
 
 #ifdef HAVE_X11_XKBLIB_H
 #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
     #define explicit __wx_explicit

-  #endif

   
   

-  #include "X11/XKBlib.h"
+    #include "X11/XKBlib.h"

   
   

-  #ifdef __HPUX__

     #undef explicit
     #undef explicit

-  #endif // __HPUX__

 #endif // HAVE_X11_XKBLIB_H
 
 // ----------------------------------------------------------------------------
 #endif // HAVE_X11_XKBLIB_H
 
 // ----------------------------------------------------------------------------

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 1675dfe547b0ebf44790392f5a5e8ce906c2b5d6..5f563ac295e73b4ac21ca1f461226ed38d4d3101 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -30,17 +30,14 @@
 #include "gdk/gdkx.h"
 
 #ifdef HAVE_X11_XKBLIB_H
 #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
     #define explicit __wx_explicit

-  #endif

   
   

-  #include "X11/XKBlib.h"
+    #include "X11/XKBlib.h"

   
   

-  #ifdef __HPUX__

     #undef explicit
     #undef explicit

-  #endif // __HPUX__

 #endif // HAVE_X11_XKBLIB_H
 
 // ----------------------------------------------------------------------------
 #endif // HAVE_X11_XKBLIB_H
 
 // ----------------------------------------------------------------------------