Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct platform detection with DJGPP

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-15 23:17:40 +00:00
parent b916f80933
commit 865c589e50
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/wx/platform.h
View File

@@ -78,13 +78,32 @@
#endif #endif
/* /*
OS: first test for generic Unix defines, then for particular flavours and OS: first of all, test for MS-DOS platform. We must do this before testing
for Unix, because DJGPP compiler defines __unix__ under MS-DOS
*/
#if defined(__GO32__) || defined(__DJGPP__) || defined(__DOS__)
#ifndef __DOS__
#define __DOS__
#endif
/* size_t is the same as unsigned int for Watcom 11 compiler, */
/* so define it if it hadn't been done by configure yet */
#if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
#ifdef __WATCOMC__
#define wxSIZE_T_IS_UINT
#endif
#ifdef __DJGPP__
#define wxSIZE_T_IS_ULONG
#endif
#endif
/*
OS: then test for generic Unix defines, then for particular flavours and
finally for Unix-like systems finally for Unix-like systems
*/ */
#if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \ #elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \ defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \ defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
defined(__EMX__) || defined(__VMS) || defined(__BEOS__) defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
#define __UNIX_LIKE__ #define __UNIX_LIKE__
@@ -168,12 +187,6 @@
#endif #endif
#define wxSIZE_T_IS_UINT #define wxSIZE_T_IS_UINT
#elif defined(__DOS__)
/* size_t is the same as unsigned int for Watcom 11 compiler, */
/* so define it if it hadn't been done by configure yet */
#if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
#define wxSIZE_T_IS_UINT
#endif
#else /* Windows */ #else /* Windows */
#ifndef __WINDOWS__ #ifndef __WINDOWS__
#define __WINDOWS__ #define __WINDOWS__