HP-UX gcc compilation fixes

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 55deb62757b3e9f2d90fe5100bff67d6fc6d9978..b53360db439a045fb966b08120682c7a22279ff5 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -53,7 +53,7 @@
         #endif
     #endif // Sun
 
         #endif
     #endif // Sun
 

-    #ifdef __hpux
+    #if defined(__hpux) && !defined(__HPUX__)

         #define __HPUX__
     #endif // HP-UX
 
         #define __HPUX__
     #endif // HP-UX
 


@@ -108,11 +108,14 @@
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //

-#if defined(__HPUX__) && !defined(__WXMOTIF__)
-# define __WXMOTIF__
+#if defined(__HPUX__) && !defined(__WXGTK__)
+    #ifndef __WXMOTIF__  
+        #define __WXMOTIF__
+    #endif // __WXMOTIF__

 #endif
 #endif

+

 #if defined(__WXMOTIF__)
 #if defined(__WXMOTIF__)

-# define __X__
+    #define __X__

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__