Some OS/2 updates for VA3.0, specifically, in gsocket

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

diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index 1b901b20c4bf966c9a73e4eb7975b8c80b231805..611f53c95985557305158c9a98b50e1738a28121 100644 (file)
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -187,11 +187,22 @@ bool wxAcceleratorTable::Translate(
 ) const
 {
     PQMSG                           pMsg = (PQMSG)pWxmsg;
-
-    return Ok() && ::WinTranslateAccel( vHabmain
-                                       ,(HWND)hWnd
-                                       ,GetHaccel()
-                                       ,pMsg
-                                       );
+    BOOL                            rc = FALSE;
+
+    rc = ::WinTranslateAccel( vHabmain
+                             ,(HWND)hWnd
+                             ,GetHaccel()
+                             ,pMsg
+                            );
+    if (rc)
+    {
+        int x = 1;
+    }
+    return (Ok() && rc);
+//    ::WinTranslateAccel( vHabmain
+//                        ,(HWND)hWnd
+//                        ,GetHaccel()
+//                        ,pMsg
+//                       );
 } // end of wxAcceleratorTable::Translate
 

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index 2563bf66fea6ba7e682312be745290ee06d50fc2..1eef6eb14c1c29e615b122d5f1659e347b6b2030 100644 (file)
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -57,7 +57,12 @@ int _System soclose(int);
 
 #include <string.h>
 #include <stdio.h>
-//#include <stdlib.h>
+#if defined(__VISAGECPP__) && __IBMCPP__ < 400
+#  ifdef min
+#  undef min
+#  endif
+#  include <stdlib.h>
+#endif
 #include <stddef.h>
 #include <ctype.h>