From: Vadim Zeitlin Date: Thu, 4 Mar 1999 17:43:06 +0000 (+0000) Subject: HP-UX compilation fixes (or so I hope) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5b34447be3beacddcc17dd09a4ab74388f5a9f39 HP-UX compilation fixes (or so I hope) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/defs.h b/include/wx/defs.h index 0236ab92f4..e26d1fda96 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -26,8 +26,10 @@ // ---------------------------------------------------------------------------- // OS -#if defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi ) || \ - defined(__unix__) || defined(sun) || defined(__SUN__) +#if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \ + defined(__LINUX__) || defined(__sgi ) || \ + defined(__hpux) || defined(sun) || defined(__SUN__) + #ifndef __UNIX__ #define __UNIX__ #endif // Unix @@ -50,8 +52,13 @@ #endif // Sun CC #endif #endif // Sun + + #ifdef __hpux + #define __HPUX__ + #endif // HP-UX + #elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) ) - // MacOS + // MacOS #else // Windows #ifndef __WINDOWS__ #define __WINDOWS__ @@ -92,7 +99,7 @@ #endif // __DECCXX // Resolves linking problems under HP-UX -#if defined(__HPUX__) && !defined(__GNUG__) +#if defined(__HPUX__) && defined(__GNUG__) #define va_list __gnuc_va_list #endif // HP-UX