X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/279338910fbf9be5229ec2ece0a896c71cc004f4..956dbab1eb04b32a006303df25fd05116eb5ef11:/src/gtk1/utilsgtk.cpp?ds=inline

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index dddd561bcc..5f563ac295 100644
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -18,36 +18,26 @@
 #include "wx/unix/execute.h"
 
 #include <stdarg.h>
-#include <dirent.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/wait.h>
-#include <pwd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <signal.h>
-#include <fcntl.h>          // for O_WRONLY and friends
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
-#include <gdk/gdkx.h>
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gtk/gtkfeatures.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
-  #endif
   
-  #include "X11/XKBlib.h"
+    #include "X11/XKBlib.h"
   
-  #ifdef __HPUX__
     #undef explicit
-  #endif // __HPUX__
 #endif // HAVE_X11_XKBLIB_H
 
 // ----------------------------------------------------------------------------