*** empty log message ***

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

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index 85ea3a2313d18a6de82f7abb73b19cc1cb51d2f5..cccf54e43300c532072a9a1156a9034da566988c 100644 (file)
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -14,15 +14,21 @@
 #define BSD_SELECT // use Berkley Sockets select
 
 #include <assert.h>
-#include <sys\ioctl.h>
 #include <sys\types.h>
-#include <sys\socket.h>
 #include <utils.h>
 #include <sys\time.h>
 #include <in.h>
 #include <netdb.h>
 #include <nerrno.h>
+#if defined(__VISAGECPP__) && __IBMCPP__ < 400
+#include <socket.h>
+#include <ioctl.h>
+#include <select.h>
+#else
+#include <sys\socket.h>
+#include <sys\ioctl.h>
 #include <sys\select.h>
+#endif
 
 #include <string.h>
 #include <stdio.h>

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index abea758038897dad3ab8dd19b37d4ab2d9427c8b..f6adb6b772ffef2f99bf37f8b435ae02d07e41a9 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -160,7 +160,7 @@ bool wxShell(
     SData.PgmName  = zShell;
 
     sInputs = "/C " + rCommand;
-    SData.PgmInputs     = NULL; //(BYTE*)sInputs.c_str();
+    SData.PgmInputs     = (BYTE*)sInputs.c_str();
     SData.TermQ         = 0;
     SData.Environment   = 0;
     SData.InheritOpt    = SSF_INHERTOPT_SHELL;
@@ -177,7 +177,7 @@ bool wxShell(
     SData.ObjectBuffLen = (ULONG)sizeof(achObjBuf);
 
     rc = ::DosStartSession(&SData, &ulSessID, &vPid);
-    if (rc == 0)
+    if (rc == 0 || rc == 457) // NO_ERROR or SMG_START_IN_BACKGROUND
     {
         PTIB                            ptib;
         PPIB                            ppib;