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

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index 92187d9b61..c13b9b3473 100644
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -35,8 +35,6 @@
 #include <ctype.h>
 #ifdef __EMX__
 #include <dirent.h>
-#else
-#include <direct.h>
 #endif
 
 #include <sys/stat.h>
@@ -45,6 +43,30 @@
 #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>