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

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2008-02-25 00:48:07 +0000 (Mon, 25 Feb 2008)
New Revision: 2093

Modified:
   box/trunk/lib/common/BoxPlatform.h
Log:
Don't try to define our own dirfd() macro on platforms where interception
is impossible (such as win32) because it's not needed and fails on win32.


Modified: box/trunk/lib/common/BoxPlatform.h
===================================================================
--- box/trunk/lib/common/BoxPlatform.h	2008-02-22 00:43:16 UTC (rev 2092)
+++ box/trunk/lib/common/BoxPlatform.h	2008-02-25 00:48:07 UTC (rev 2093)
@@ -165,11 +165,11 @@
 	#include "emu.h"
 #endif
 
-// Solaris has no dirfd(x) macro or function, and we need one.
-// We cannot define macros with arguments directly using AC_DEFINE,
-// so do it here instead of in configure.ac.
+// Solaris has no dirfd(x) macro or function, and we need one for
+// intercept tests. We cannot define macros with arguments directly 
+// using AC_DEFINE, so do it here instead of in configure.ac.
 
-#if ! HAVE_DECL_DIRFD
+#if ! defined PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE && ! HAVE_DECL_DIRFD
 	#ifdef HAVE_DIR_D_FD
 		#define dirfd(x) (x)->d_fd
 	#elif defined HAVE_DIR_DD_FD