From 3fb98ddfec915b743043a7f85d80388264dda4db Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 3 Aug 1999 11:26:39 +0000 Subject: [PATCH] __UNIX__ redefition corrected git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 32c27378fc..15e3598434 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -26,9 +26,7 @@ defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \ defined(__EMX__) - #ifndef __UNIX__ - #define __UNIX__ - #endif // Unix + #define __UNIX_LIKE__ // Helps SGI compilation, apparently #ifdef __SGI__ @@ -190,6 +188,12 @@ #undef PACKAGE #undef VERSION +// if we're on a Unixsystem but didn't use configure (so that setup.h didn't +// define __UNIX__), do define __UNIX__ now +#if !defined(__UNIX__) && defined(__UNIX_LIKE__) + #define __UNIX__ +#endif // Unix + #include "wx/version.h" // ============================================================================ -- 2.45.2