X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dea36ef6d117e0562f0079345a77ff1696d3a49..c48269b9f7afca9c8e7076e0ceb06b933b2e88b8:/src/os2/utilsexc.cpp

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index f80036e7d4..c13b9b3473 100644
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -26,12 +26,16 @@
 #include "wx/os2/private.h"
 
 #define PURE_32
+#ifndef __EMX__
 #include <upm.h>
 #include <netcons.h>
 #include <netbios.h>
+#endif
 
 #include <ctype.h>
-#include <direct.h>
+#ifdef __EMX__
+#include <dirent.h>
+#endif
 
 #include <sys/stat.h>
 #include <io.h>
@@ -39,9 +43,34 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+//
+// already defined via nerror.h in app.h so undef them
+//
+#ifdef EEXIST
+#undef EEXIST
+#endif
+#ifdef ENOENT
+#undef ENOENT
+#endif
+#ifdef EMFILE
+#undef EMFILE
+#endif
+#ifdef EINTR
+#undef EINTR
+#endif
+#ifdef EINVAL
+#undef EINVAL
+#endif
+#ifdef ENOMEM
+#undef ENOMEM
+#endif
+#ifdef EACCES
+#undef EACCES
+#endif
 #include <errno.h>
 #include <stdarg.h>
 
+
 // this message is sent when the process we're waiting for terminates
 #define wxWM_PROC_TERMINATED (WM_USER + 10000)
 
@@ -55,7 +84,7 @@ struct wxExecuteData
 public:
     ~wxExecuteData()
     {
-        cout << "Closing thread: " << endl;
+//         cout << "Closing thread: " << endl;
         DosExit(EXIT_PROCESS, 0);
     }
 
@@ -73,7 +102,7 @@ static ULONG wxExecuteThread(
     ULONG                           ulRc;
     PID                             vPidChild;
 
-    cout << "Executing thread: " << endl;
+//     cout << "Executing thread: " << endl;
 
     ulRc = ::DosWaitChild( DCWA_PROCESSTREE
                           ,DCWW_NOWAIT
@@ -135,7 +164,7 @@ long wxExecute(
 {
     if (rCommand.IsEmpty())
     {
-        cout << "empty command in wxExecute." << endl;
+//         cout << "empty command in wxExecute." << endl;
         return 0;
     }
 
@@ -168,7 +197,7 @@ long wxExecute(
         wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc);
         return 0;
     }
-    cout << "Executing: " << rCommand.c_str() << endl;
+//     cout << "Executing: " << rCommand.c_str() << endl;
     // Alloc data
     wxExecuteData*                  pData = new wxExecuteData;