[Box Backup-dev] COMMIT r253 - in box/chris/win32/pipe-security/lib: common win32

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2005-12-20 19:46:44 +0000 (Tue, 20 Dec 2005)
New Revision: 253

Modified:
   box/chris/win32/pipe-security/lib/common/BoxPlatform.h
   box/chris/win32/pipe-security/lib/win32/emu.h
Log:
* lib/win32/emu.h
* lib/common/BoxPlatform.h
- Compile fixes for Microsoft Visual C++ 2005 (not retested on MinGW yet)


Modified: box/chris/win32/pipe-security/lib/common/BoxPlatform.h
===================================================================
--- box/chris/win32/pipe-security/lib/common/BoxPlatform.h	2005-12-20 19:44:53 UTC (rev 252)
+++ box/chris/win32/pipe-security/lib/common/BoxPlatform.h	2005-12-20 19:46:44 UTC (rev 253)
@@ -77,9 +77,13 @@
 	#define HAVE_UINT16_T
 	#define HAVE_UINT32_T
 	#define HAVE_UINT64_T
+	#define HAVE_U_INT8_T
+	#define HAVE_U_INT16_T
+	#define HAVE_U_INT32_T
+	#define HAVE_U_INT64_T
 
-	typedef unsigned int uid_t;
-	typedef unsigned int gid_t;
+	// typedef unsigned int uid_t;
+	// typedef unsigned int gid_t;
 	typedef int pid_t;
 #endif // WIN32 && !__MINGW32__
 

Modified: box/chris/win32/pipe-security/lib/win32/emu.h
===================================================================
--- box/chris/win32/pipe-security/lib/win32/emu.h	2005-12-20 19:44:53 UTC (rev 252)
+++ box/chris/win32/pipe-security/lib/win32/emu.h	2005-12-20 19:46:44 UTC (rev 253)
@@ -3,7 +3,7 @@
 #if ! defined EMU_INCLUDE && defined WIN32
 #define EMU_INCLUDE
 
-#define _STAT_DEFINED
+// #define _STAT_DEFINED
 #define _INO_T_DEFINED
 
 #include <winsock2.h>
@@ -178,7 +178,7 @@
 			str = str.substr(index+1, str.size());
 		}
 
-		index = str.find('-');
+		index = (int)str.find('-');
 
 		if ( index == -1 ) return -1;
 
@@ -187,7 +187,7 @@
 		optind ++;
 		str = args[optind];
 	}
-	while ( ( opttolookfor = interestin.find(opt)) == -1 );
+	while ( ( opttolookfor = (int)interestin.find(opt)) == -1 );
 
 	if ( interestin[opttolookfor+1] == ':' ) 
 	{
@@ -257,7 +257,7 @@
 
 inline int mkdir(const char *pathname, mode_t mode)
 {
-	return mkdir(pathname);
+	return _mkdir(pathname);
 }
 
 #ifdef __MINGW32__
@@ -358,6 +358,7 @@
 	TCHAR f_mntonname[MAX_PATH];
 };
 
+#if 0
 // I think this should get us going
 // Although there is a warning about 
 // mount points in win32 can now exists - which means inode number can be 
@@ -381,6 +382,7 @@
 #ifndef __MINGW32__
 typedef u_int64_t _ino_t;
 #endif
+#endif // 0
 
 int ourstat(const char * name, struct stat * st);
 int ourfstat(HANDLE file, struct stat * st);