Fixes errno.h problems

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 7daefe297d7061bb4fc95ad5bdae262b837e15fc..bd4b47a6cfe26610e2e3b41c2a5f70a4be9e18e5 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -44,6 +44,7 @@
 
 #else
 
+#include <nerrno.h>
 #include <ioctl.h>
 #include <select.h>
 

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index cf95be985587da9edae84d5ddfcc650fe071400b..94a7823eebfe91e39dcf9cea616fe7f555d96963 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -35,30 +35,6 @@
 #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>
 

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index c13b9b3473aa95f7e6aea50484b939c366a61d3f..f9f3885e1673fc3ba8472c4a7a32cbb92ec5bc8c 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -43,30 +43,6 @@
 #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>