Some OS/2 Modifications

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 5de3bdf6974dc077e576066a3fdf6837f48f1529..917a505aea507db69c083ac4f8b5a2f8a6c1ea12 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -70,7 +70,7 @@
 // using this macro allows constuctions like "wxSTD iostream" to work in
 // either case
 #if !wxUSE_IOSTREAMH
 // using this macro allows constuctions like "wxSTD iostream" to work in
 // either case
 #if !wxUSE_IOSTREAMH

- #define wxSTD std::
+  #define wxSTD std::

 #else
  #define wxSTD
 #endif
 #else
  #define wxSTD
 #endif


@@ -1951,7 +1951,7 @@ typedef struct tagLOGPALETTE
 #elif defined(__WIN32__)
     typedef int (__stdcall *WXFARPROC)();
 #elif defined(__WXPM__)
 #elif defined(__WIN32__)
     typedef int (__stdcall *WXFARPROC)();
 #elif defined(__WXPM__)

-#  if (defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )) || defined (__WATCOMC__)
+#  if (defined(__VISAGECPP__) && (__IBMCPP__ < 400)) || defined (__WATCOMC__)

     // VA 3.0 for some reason needs base data types when typedefing a proc proto???
     typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
 #  else
     // VA 3.0 for some reason needs base data types when typedefing a proc proto???
     typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
 #  else