From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 8 Oct 2004 00:26:20 +0000 (+0000)
Subject: (blind) fix for Metrowerks/Win32 compilation
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eb84314b7912a5f7ee22c208b327907085b6c097?ds=inline

(blind) fix for Metrowerks/Win32 compilation


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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 551d9f6852..8835bdb28c 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -298,20 +298,22 @@ enum wxSeekMode
     #endif
 
     // constants (unless already defined by the user code)
-    #if !defined(O_RDONLY) && !defined(__BORLANDC__) && !defined(__WATCOMC__)
-        #define   O_RDONLY    _O_RDONLY
-        #define   O_WRONLY    _O_WRONLY
-        #define   O_RDWR      _O_RDWR
-        #define   O_EXCL      _O_EXCL
-        #define   O_CREAT     _O_CREAT
-        #define   O_BINARY    _O_BINARY
-    #endif
-
     #if !defined(__BORLANDC__) && !defined(__WATCOMC__)
-        #define   S_IFMT      _S_IFMT
-        #define   S_IFDIR     _S_IFDIR
-        #define   S_IFREG     _S_IFREG
-    #endif // O_RDONLY
+        #ifndef O_RDONLY
+            #define   O_RDONLY    _O_RDONLY
+            #define   O_WRONLY    _O_WRONLY
+            #define   O_RDWR      _O_RDWR
+            #define   O_EXCL      _O_EXCL
+            #define   O_CREAT     _O_CREAT
+            #define   O_BINARY    _O_BINARY
+        #endif
+
+        #ifndef S_IFMT
+            #define   S_IFMT      _S_IFMT
+            #define   S_IFDIR     _S_IFDIR
+            #define   S_IFREG     _S_IFREG
+        #endif
+    #endif
 
     // It's a private define, undefine it so nobody gets tempted to use it
     #undef wxHAS_HUGE_FILES