Changeset 3011 for box/trunk/lib

Timestamp:

08/10/2011 13:41:28 (8 months ago)

Author:

chris

Message:

Recent Cygwin versions of MinGW now define O_BINARY as well, also in
fcntl.h, so include it if we can find it, and only define O_BINARY if
it turns out to be missing.

Location:

box/trunk/lib

Files:

• common/BoxConfig-MSVC.h (modified) (1 diff)
• win32/emu.h (modified) (2 diffs)

box/trunk/lib/common/BoxConfig-MSVC.h

@@ -76 +76 @@
 /* Define to 1 if you have the <execinfo.h> header file. */
 /* #undef HAVE_EXECINFO_H */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
 
 /* Define to 1 if you have the `flock' function. */

box/trunk/lib/win32/emu.h

@@ -15 +15 @@
 #if ! defined EMU_INCLUDE && defined WIN32
 #define EMU_INCLUDE
+
+// Need feature detection macros below
+#include "../common/BoxConfig.h"
 
 // Shut up stupid new warnings. Thanks MinGW! Ever heard of "compatibility"?
@@ -451 +454 @@
 // [https://stat.ethz.ch/pipermail/r-devel/2005-May/033339.html]
 #ifndef HAVE_FTRUNCATE
-        int ftruncate(int, off_t); 
+        extern "C" int ftruncate(int, off_t); 
         inline int ftruncate(int __fd, off_t __length) 
         {