__UNIX__ redefition corrected

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-08-03 11:26:39 +00:00
parent 6ccec5fcb2
commit 3fb98ddfec

View File

@@ -26,9 +26,7 @@
defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \ defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
defined(__EMX__) defined(__EMX__)
#ifndef __UNIX__ #define __UNIX_LIKE__
#define __UNIX__
#endif // Unix
// Helps SGI compilation, apparently // Helps SGI compilation, apparently
#ifdef __SGI__ #ifdef __SGI__
@@ -190,6 +188,12 @@
#undef PACKAGE #undef PACKAGE
#undef VERSION #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" #include "wx/version.h"
// ============================================================================ // ============================================================================