[Box Backup-commit] COMMIT r1087 - box/chris/merge/lib/common

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-17 00:21:36 +0100 (Tue, 17 Oct 2006)
New Revision: 1087

Modified:
   box/chris/merge/lib/common/BoxPlatform.h
Log:
Use BoxConfig-MSVC.h and BoxVersion.h when compiling with MSVC. (refs #3)


Modified: box/chris/merge/lib/common/BoxPlatform.h
===================================================================
--- box/chris/merge/lib/common/BoxPlatform.h	2006-10-16 23:20:59 UTC (rev 1086)
+++ box/chris/merge/lib/common/BoxPlatform.h	2006-10-16 23:21:36 UTC (rev 1087)
@@ -21,7 +21,12 @@
 
 #define PLATFORM_DEV_NULL			"/dev/null"
 
+#ifdef _MSC_VER
+#include "BoxConfig-MSVC.h"
+#include "BoxVersion.h"
+#else
 #include "BoxConfig.h"
+#endif
 
 #ifdef WIN32
 	// need msvcrt version 6.1 or higher for _gmtime64()
@@ -97,8 +102,6 @@
 	#define HAVE_U_INT16_T
 	#define HAVE_U_INT32_T
 	#define HAVE_U_INT64_T
-
-	typedef int pid_t;
 #endif // WIN32 && !__MINGW32__
 
 // Define missing types