From 508203b0569ac5a3959daacaa0d1ab969c3c7a16 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 21 May 1999 11:38:59 +0000
Subject: [PATCH] HP-UX gcc compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/defs.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 55deb62757..b53360db43 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -53,7 +53,7 @@
         #endif
     #endif // Sun
 
-    #ifdef __hpux
+    #if defined(__hpux) && !defined(__HPUX__)
         #define __HPUX__
     #endif // HP-UX
 
@@ -108,11 +108,14 @@
 //////////////////////////////////////////////////////////////////////////////////
 // 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
+
 #if defined(__WXMOTIF__)
-# define __X__
+    #define __X__
 #endif
 
 #ifdef __WXMSW__
-- 
2.45.2