Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

explicit compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-30 17:02:44 +00:00
parent 7ff14117cb
commit 154c4aa113
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/utilsgtk.cpp
View File

@@ -30,17 +30,14 @@
#include "gdk/gdkx.h" #include "gdk/gdkx.h"
#ifdef HAVE_X11_XKBLIB_H #ifdef HAVE_X11_XKBLIB_H
#ifdef __HPUX__ /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
/* under HP-UX XKBlib.h defines structures with field named "explicit" - * field named "explicit" - which is, of course, an error for a C++
* which is, of course, an error for a C++ compiler */ * 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
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

11
src/gtk1/utilsgtk.cpp
View File

@@ -30,17 +30,14 @@
#include "gdk/gdkx.h" #include "gdk/gdkx.h"
#ifdef HAVE_X11_XKBLIB_H #ifdef HAVE_X11_XKBLIB_H
#ifdef __HPUX__ /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
/* under HP-UX XKBlib.h defines structures with field named "explicit" - * field named "explicit" - which is, of course, an error for a C++
* which is, of course, an error for a C++ compiler */ * 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
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------