Identify OS/2 by defining __OS2__.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index ef25fc23ca3f64eb4c1879a7cb3ad6265b9e3dc0..9130131f6b1c40b18bb80f62d45db59d7d01a4a9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -290,6 +290,7 @@ case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
     AC_DEFINE(__EMX__)
     USE_OS2=1
   *-pc-os2_emx | *-pc-os2-emx )
     AC_DEFINE(__EMX__)
     USE_OS2=1

+    AC_DEFINE(__OS2__)

     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
     dnl "c++" wrapper is not always available, so always use plain gcc.
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
     dnl "c++" wrapper is not always available, so always use plain gcc.

diff --git a/setup.h.in b/setup.h.in
index a2ad505a0794c0ba79fd02b941056bca31e68df0..3d02255d6f1a48c176ced68f34eca24586f15fe0 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -125,6 +125,9 @@
 #undef WINVER
 #endif
 
 #undef WINVER
 #endif
 

+/* OS/2 with EMX */
+#undef __OS2__
+

 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 #define wxUSE_NATIVE_STATUSBAR 1
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 #define wxUSE_NATIVE_STATUSBAR 1