Changeset 2257

Timestamp:

21/08/2008 12:08:44 (4 years ago)

Author:

chris

Message:

Better handle the case where MSVCRT_VERSION is already defined (e.g.
by wxWidgets) before including Box.h, as long as the defined version is
high enough, to avoid mutual incompatibility with wxWidgets (needed for
Boxi).

Define O_BINARY if it's not already defined rather than using configury.

File:

• box/trunk/lib/common/BoxPlatform.h (modified) (2 diffs)

box/trunk/lib/common/BoxPlatform.h

@@ -31 +31 @@
 #ifdef WIN32
         #ifdef __MSVCRT_VERSION__
-                #error Must include Box.h before sys/types.h
+                #if __MSVCRT_VERSION__ < 0x0601
+                        #error Must include Box.h before sys/types.h
+                #endif
+        #else
+                // need msvcrt version 6.1 or higher for _gmtime64()
+                // must define this before importing <sys/types.h>
+                #define __MSVCRT_VERSION__ 0x0601
         #endif
-        // need msvcrt version 6.1 or higher for _gmtime64()
-        // must define this before importing <sys/types.h>
-        #define __MSVCRT_VERSION__ 0x0601
 #endif
 
@@ -154 +157 @@
 
 // for Unix compatibility with Windows :-)
-#if !HAVE_DECL_O_BINARY
+#ifndef O_BINARY
         #define O_BINARY 0
 #endif