[Box Backup-commit] COMMIT r984 - box/trunk/lib/common

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-12 21:53:23 +0100 (Thu, 12 Oct 2006)
New Revision: 984

Modified:
   box/trunk/lib/common/BoxPlatform.h
Log:
 * Disable intercept tests on Win32 as well
 * Define O_BINARY to 0 (zero) if our platform doesn't have it (all except
Win32?) which enables us to reduce #ifdefs


Modified: box/trunk/lib/common/BoxPlatform.h
===================================================================
--- box/trunk/lib/common/BoxPlatform.h	2006-10-12 20:52:52 UTC (rev 983)
+++ box/trunk/lib/common/BoxPlatform.h	2006-10-12 20:53:23 UTC (rev 984)
@@ -40,8 +40,8 @@
 	#endif
 #endif
 
-// Slight hack; disable interception on Darwin within raidfile test
-#ifdef __APPLE__
+// Slight hack; disable interception in raidfile test on Darwin and Windows
+#if defined __APPLE__ || defined WIN32
 	// TODO: Replace with autoconf test
 	#define PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
 #endif
@@ -138,6 +138,11 @@
 	#define INFTIM -1
 #endif
 
+// for Unix compatibility with Windows :-)
+#if !HAVE_DECL_O_BINARY
+	#define O_BINARY 0
+#endif
+
 #ifdef WIN32
 	typedef u_int64_t InodeRefType;
 #else