From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Tue, 31 Oct 2006 23:29:02 +0000 (+0000)
Subject: Maximize chances to find an existing definition for O_BINARY and MAX_PATHLEN.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7cbe148e2fb4a47a84873708936fb2e88ed02e2c

Maximize chances to find an existing definition for O_BINARY and MAX_PATHLEN.


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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 7c494b4d71..5f4ec23ee3 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -99,20 +99,10 @@
     };
 #endif // W_OK
 
-// there is no distinction between text and binary files under Unix, so define
-// O_BINARY as 0 if the system headers don't do it already
-#if defined(__UNIX__) && !defined(O_BINARY)
-    #define   O_BINARY    (0)
-#endif  //__UNIX__
-
 #ifdef __SALFORDC__
     #include <unix.h>
 #endif
 
-#ifndef MAX_PATH
-    #define MAX_PATH 512
-#endif
-
 // some broken compilers don't have 3rd argument in open() and creat()
 #ifdef __SALFORDC__
     #define ACCESS(access)
@@ -132,6 +122,12 @@
 #include  "wx/file.h"
 #include  "wx/filefn.h"
 
+// there is no distinction between text and binary files under Unix, so define
+// O_BINARY as 0 if the system headers don't do it already
+#if defined(__UNIX__) && !defined(O_BINARY)
+    #define   O_BINARY    (0)
+#endif  //__UNIX__
+
 #ifdef __WXMSW__
     #include "wx/msw/mslu.h"
 #endif
@@ -140,6 +136,9 @@
     #include "wx/msw/private.h"
 #endif
 
+#ifndef MAX_PATH
+    #define MAX_PATH 512
+#endif
 
 // ============================================================================
 // implementation of wxFile