Remove non-standard BSD u_int* types.

MSVC doesn't like them, and they're not necessary now that we have stdint.h.

Remove some compatibility typedefs from BoxPlatform.h and emu.h which are not
needed any longer either.

7 files changed, 50 insertions, 116 deletions

diff --git a/lib/backupstore/BackupClientFileAttributes.cpp b/lib/backupstore/BackupClientFileAttributes.cpp
index e331e107..7ec6f478 100644
--- a/lib/backupstore/BackupClientFileAttributes.cpp
+++ b/lib/backupstore/BackupClientFileAttributes.cpp
@@ -55,20 +55,20 @@ BEGIN_STRUCTURE_PACKING_FOR_WIRE
 typedef struct 
 {
 	int32_t		AttributeType;
-	u_int32_t	UID;
-	u_int32_t	GID;
-	u_int64_t	ModificationTime;
-	u_int64_t	AttrModificationTime;
-	u_int32_t	UserDefinedFlags;
-	u_int32_t	FileGenerationNumber;
-	u_int16_t	Mode;
+	uint32_t	UID;
+	uint32_t	GID;
+	uint64_t	ModificationTime;
+	uint64_t	AttrModificationTime;
+	uint32_t	UserDefinedFlags;
+	uint32_t	FileGenerationNumber;
+	uint16_t	Mode;
 	// Symbolic link filename may follow
 	// Extended attribute (xattr) information may follow, format is:
-	//   u_int32_t     Size of extended attribute block (excluding this word)
+	//   uint32_t     Size of extended attribute block (excluding this word)
 	// For each of NumberOfAttributes (sorted by AttributeName):
-	//   u_int16_t     AttributeNameLength
+	//   uint16_t     AttributeNameLength
 	//   char          AttributeName[AttributeNameLength]
-	//   u_int32_t     AttributeValueLength
+	//   uint32_t     AttributeValueLength
 	//   unsigned char AttributeValue[AttributeValueLength]
 	// AttributeName is 0 terminated, AttributeValue is not (and may be binary data)
 } attr_StreamFormat;
@@ -117,7 +117,7 @@ namespace
 BackupClientFileAttributes::BackupClientFileAttributes()
 	: mpClearAttributes(0)
 {
-	ASSERT(sizeof(u_int64_t) == sizeof(box_time_t));
+	ASSERT(sizeof(uint64_t) == sizeof(box_time_t));
 }
 
 // --------------------------------------------------------------------------
@@ -131,7 +131,7 @@ BackupClientFileAttributes::BackupClientFileAttributes()
 BackupClientFileAttributes::BackupClientFileAttributes(const EMU_STRUCT_STAT &st)
 : mpClearAttributes(0)
 {
-	ASSERT(sizeof(u_int64_t) == sizeof(box_time_t));
+	ASSERT(sizeof(uint64_t) == sizeof(box_time_t));
 	StreamableMemBlock *pnewAttr = new StreamableMemBlock;
 	FillAttributes(*pnewAttr, (const char *)NULL, st, true);
 
@@ -411,7 +411,7 @@ void BackupClientFileAttributes::ReadAttributes(const std::string& Filename,
 		// __time64_t winTime = BoxTimeToSeconds(
 		// pnewAttr->ModificationTime);
 
-		u_int64_t  modTime = box_ntoh64(pattr->ModificationTime);
+		uint64_t  modTime = box_ntoh64(pattr->ModificationTime);
 		box_time_t modSecs = BoxTimeToSeconds(modTime);
 		__time64_t winTime = modSecs;
 
@@ -582,30 +582,30 @@ void BackupClientFileAttributes::FillExtendedAttr(StreamableMemBlock &outputBloc
 
 			// Leave space for attr block size later
 			int xattrBlockSizeOffset = xattrSize;
-			xattrSize += sizeof(u_int32_t);
+			xattrSize += sizeof(uint32_t);
 
 			// Loop for each attribute
 			for(std::vector<std::string>::const_iterator attrKeyI = attrKeys.begin(); attrKeyI!=attrKeys.end(); ++attrKeyI)
 			{
 				std::string attrKey(*attrKeyI);
 
-				if(xattrSize+sizeof(u_int16_t)+attrKey.size()+1+sizeof(u_int32_t)>static_cast<unsigned int>(xattrBufferSize))
+				if(xattrSize+sizeof(uint16_t)+attrKey.size()+1+sizeof(uint32_t)>static_cast<unsigned int>(xattrBufferSize))
 				{
-					xattrBufferSize = (xattrBufferSize+sizeof(u_int16_t)+attrKey.size()+1+sizeof(u_int32_t))*2;
+					xattrBufferSize = (xattrBufferSize+sizeof(uint16_t)+attrKey.size()+1+sizeof(uint32_t))*2;
 					outputBlock.ResizeBlock(xattrBufferSize);
 					buffer = static_cast<unsigned char*>(outputBlock.GetBuffer());
 				}
 
 				// Store length and text for attibute name
-				u_int16_t keyLength = htons(attrKey.size()+1);
-				std::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
-				xattrSize += sizeof(u_int16_t);
+				uint16_t keyLength = htons(attrKey.size()+1);
+				std::memcpy(buffer+xattrSize, &keyLength, sizeof(uint16_t));
+				xattrSize += sizeof(uint16_t);
 				std::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
 				xattrSize += attrKey.size()+1;
 
 				// Leave space for value size
 				int valueSizeOffset = xattrSize;
-				xattrSize += sizeof(u_int32_t);
+				xattrSize += sizeof(uint32_t);
 
 				// Find size of attribute (must call with buffer and length 0 on some platforms,
 				// as -1 is returned if the data doesn't fit.)
@@ -642,13 +642,13 @@ void BackupClientFileAttributes::FillExtendedAttr(StreamableMemBlock &outputBloc
 				xattrSize += valueSize;
 
 				// Fill in value size
-				u_int32_t valueLength = htonl(valueSize);
-				std::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
+				uint32_t valueLength = htonl(valueSize);
+				std::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(uint32_t));
 			}
 
 			// Fill in attribute block size
-			u_int32_t xattrBlockLength = htonl(xattrSize-xattrBlockSizeOffset-sizeof(u_int32_t));
-			std::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
+			uint32_t xattrBlockLength = htonl(xattrSize-xattrBlockSizeOffset-sizeof(uint32_t));
+			std::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(uint32_t));
 
 			outputBlock.ResizeBlock(xattrSize);
 		}
@@ -853,7 +853,7 @@ void BackupClientFileAttributes::WriteAttributes(const std::string& Filename,
 		#endif
 	}
 
-	if(static_cast<int>(xattrOffset+sizeof(u_int32_t))<=mpClearAttributes->GetSize())
+	if(static_cast<int>(xattrOffset+sizeof(uint32_t))<=mpClearAttributes->GetSize())
 	{
 		WriteExtendedAttr(Filename, xattrOffset);
 	}
@@ -995,10 +995,10 @@ void BackupClientFileAttributes::WriteExtendedAttr(const std::string& Filename,
 #ifdef HAVE_SYS_XATTR_H
 	const char* buffer = static_cast<char*>(mpClearAttributes->GetBuffer());
 
-	u_int32_t xattrBlockLength = 0;
-	std::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
+	uint32_t xattrBlockLength = 0;
+	std::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(uint32_t));
 	int xattrBlockSize = ntohl(xattrBlockLength);
-	xattrOffset += sizeof(u_int32_t);
+	xattrOffset += sizeof(uint32_t);
 
 	int xattrEnd = xattrOffset+xattrBlockSize;
 	if(xattrEnd>mpClearAttributes->GetSize())
@@ -1009,18 +1009,18 @@ void BackupClientFileAttributes::WriteExtendedAttr(const std::string& Filename,
 
 	while(xattrOffset<xattrEnd)
 	{
-		u_int16_t keyLength = 0;
-		std::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
+		uint16_t keyLength = 0;
+		std::memcpy(&keyLength, buffer+xattrOffset, sizeof(uint16_t));
 		int keySize = ntohs(keyLength);
-		xattrOffset += sizeof(u_int16_t);
+		xattrOffset += sizeof(uint16_t);
 
 		const char* key = buffer+xattrOffset;
 		xattrOffset += keySize;
 
-		u_int32_t valueLength = 0;
-		std::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
+		uint32_t valueLength = 0;
+		std::memcpy(&valueLength, buffer+xattrOffset, sizeof(uint32_t));
 		int valueSize = ntohl(valueLength);
-		xattrOffset += sizeof(u_int32_t);
+		xattrOffset += sizeof(uint32_t);
 
 		// FIXME: Warn on EOPNOTSUPP
 		if(::lsetxattr(Filename.c_str(), key, buffer+xattrOffset,
diff --git a/lib/backupstore/BackupStoreContext.cpp b/lib/backupstore/BackupStoreContext.cpp
index 75e78334..1a782df4 100644
--- a/lib/backupstore/BackupStoreContext.cpp
+++ b/lib/backupstore/BackupStoreContext.cpp
@@ -1542,7 +1542,7 @@ bool BackupStoreContext::ObjectExists(int64_t ObjectID, int MustBe)
 		std::auto_ptr<RaidFileRead> objectFile(RaidFileRead::Open(mStoreDiscSet, filename));
 
 		// Read the first integer
-		u_int32_t magic;
+		uint32_t magic;
 		if(!objectFile->ReadFullBuffer(&magic, sizeof(magic), 0 /* not interested in how many read if failure */))
 		{
 			// Failed to get any bytes, must have failed
@@ -1558,7 +1558,7 @@ bool BackupStoreContext::ObjectExists(int64_t ObjectID, int MustBe)
 #endif
 
 		// Right one?
-		u_int32_t requiredMagic = (MustBe == ObjectExists_File)?OBJECTMAGIC_FILE_MAGIC_VALUE_V1:OBJECTMAGIC_DIR_MAGIC_VALUE;
+		uint32_t requiredMagic = (MustBe == ObjectExists_File)?OBJECTMAGIC_FILE_MAGIC_VALUE_V1:OBJECTMAGIC_DIR_MAGIC_VALUE;
 
 		// Check
 		if(ntohl(magic) != requiredMagic)
diff --git a/lib/common/BoxPlatform.h b/lib/common/BoxPlatform.h
index 06f34d5c..35ad7a2c 100644
--- a/lib/common/BoxPlatform.h
+++ b/lib/common/BoxPlatform.h
@@ -108,56 +108,6 @@
 	#endif
 #endif
 
-#if defined WIN32 && !defined __MINGW32__
-	typedef __int8  int8_t;
-	typedef __int16 int16_t;
-	typedef __int32 int32_t;
-	typedef __int64 int64_t;
-
-	typedef unsigned __int8  u_int8_t;
-	typedef unsigned __int16 u_int16_t;
-	typedef unsigned __int32 u_int32_t;
-	typedef unsigned __int64 u_int64_t;
-
-	#define HAVE_U_INT8_T
-	#define HAVE_U_INT16_T
-	#define HAVE_U_INT32_T
-	#define HAVE_U_INT64_T
-#endif // WIN32 && !__MINGW32__
-
-// Define missing types
-#ifndef HAVE_UINT8_T
-	typedef u_int8_t uint8_t;
-#endif
-
-#ifndef HAVE_UINT16_T
-	typedef u_int16_t uint16_t;
-#endif
-
-#ifndef HAVE_UINT32_T
-	typedef u_int32_t uint32_t;
-#endif
-
-#ifndef HAVE_UINT64_T
-	typedef u_int64_t uint64_t;
-#endif
-
-#ifndef HAVE_U_INT8_T
-	typedef uint8_t u_int8_t;
-#endif
-
-#ifndef HAVE_U_INT16_T
-	typedef uint16_t u_int16_t;
-#endif
-
-#ifndef HAVE_U_INT32_T
-	typedef uint32_t u_int32_t;
-#endif
-
-#ifndef HAVE_U_INT64_T
-	typedef uint64_t u_int64_t;
-#endif
-
 #if !HAVE_DECL_INFTIM
 	#define INFTIM -1
 #endif
@@ -176,7 +126,7 @@
 #endif
 
 #ifdef WIN32
-	typedef u_int64_t InodeRefType;
+	typedef uint64_t InodeRefType;
 #else
 	typedef ino_t InodeRefType;
 #endif
diff --git a/lib/server/Protocol.cpp b/lib/server/Protocol.cpp
index 937a2379..0adf9543 100644
--- a/lib/server/Protocol.cpp
+++ b/lib/server/Protocol.cpp
@@ -189,7 +189,7 @@ std::auto_ptr<Message> Protocol::ReceiveInternal()
 	}
 	
 	// Check the object size
-	u_int32_t objSize = ntohl(objHeader.mObjSize);
+	uint32_t objSize = ntohl(objHeader.mObjSize);
 	if(objSize < sizeof(objHeader) || objSize > mMaxObjectSize)
 	{
 		THROW_EXCEPTION(ConnectionException, Protocol_ObjTooBig)
@@ -641,7 +641,7 @@ std::auto_ptr<IOStream> Protocol::ReceiveStream()
 	}
 	
 	// Get the stream size
-	u_int32_t streamSize = ntohl(objHeader.mObjSize);
+	uint32_t streamSize = ntohl(objHeader.mObjSize);
 
 	// Inform sub class
 	InformStreamReceiving(streamSize);
@@ -836,12 +836,12 @@ int Protocol::SendStreamSendBlock(uint8_t *Block, int BytesInBlock)
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    Protocol::InformStreamReceiving(u_int32_t)
+//		Name:    Protocol::InformStreamReceiving(uint32_t)
 //		Purpose: Informs sub classes about streams being received
 //		Created: 2003/10/27
 //
 // --------------------------------------------------------------------------
-void Protocol::InformStreamReceiving(u_int32_t Size)
+void Protocol::InformStreamReceiving(uint32_t Size)
 {
 	if(GetLogToSysLog())
 	{
@@ -868,12 +868,12 @@ void Protocol::InformStreamReceiving(u_int32_t Size)
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    Protocol::InformStreamSending(u_int32_t)
+//		Name:    Protocol::InformStreamSending(uint32_t)
 //		Purpose: Informs sub classes about streams being sent
 //		Created: 2003/10/27
 //
 // --------------------------------------------------------------------------
-void Protocol::InformStreamSending(u_int32_t Size)
+void Protocol::InformStreamSending(uint32_t Size)
 {
 	if(GetLogToSysLog())
 	{
diff --git a/lib/server/Protocol.h b/lib/server/Protocol.h
index f659d3ca..fbe6461c 100644
--- a/lib/server/Protocol.h
+++ b/lib/server/Protocol.h
@@ -186,8 +186,8 @@ protected:
 	void CheckAndReadHdr(void *hdr);	// don't use type here to avoid dependency
 	
 	// Will be used for logging
-	virtual void InformStreamReceiving(u_int32_t Size);
-	virtual void InformStreamSending(u_int32_t Size);
+	virtual void InformStreamReceiving(uint32_t Size);
+	virtual void InformStreamSending(uint32_t Size);
 	
 private:
 	void EnsureBufferAllocated(int Size);
diff --git a/lib/server/ProtocolWire.h b/lib/server/ProtocolWire.h
index ff62b66e..6dee445b 100644
--- a/lib/server/ProtocolWire.h
+++ b/lib/server/ProtocolWire.h
@@ -26,8 +26,8 @@ typedef struct
 
 typedef struct
 {
-	u_int32_t	mObjSize;
-	u_int32_t	mObjType;
+	uint32_t	mObjSize;
+	uint32_t	mObjType;
 } PW_ObjectHeader;
 
 #define SPECIAL_STREAM_OBJECT_TYPE		0xffffffff
diff --git a/lib/win32/emu.h b/lib/win32/emu.h
index 5669c411..4b263e22 100644
--- a/lib/win32/emu.h
+++ b/lib/win32/emu.h
@@ -32,27 +32,11 @@
 
 // basic types, may be required by other headers since we
 // don't include sys/types.h
-
-#ifdef __MINGW32__
-	#include <stdint.h>
-#else // MSVC
-	typedef unsigned __int64 u_int64_t;
-	typedef unsigned __int64 uint64_t;
-	typedef          __int64 int64_t;
-	typedef unsigned __int32 uint32_t;
-	typedef unsigned __int32 u_int32_t;
-	typedef          __int32 int32_t;
-	typedef unsigned __int16 uint16_t;
-	typedef          __int16 int16_t;
-	typedef unsigned __int8  uint8_t;
-	typedef          __int8  int8_t;
-#endif
+#include <stdint.h>
 
 // emulated types, present on MinGW but not MSVC or vice versa
 
-#ifdef __MINGW32__
-	typedef uint32_t u_int32_t;
-#else
+#ifndef __MINGW32__
 	typedef unsigned int mode_t;
 	typedef unsigned int pid_t;
 #endif
@@ -142,7 +126,7 @@ inline struct passwd * getpwnam(const char * name)
 	#define S_ISDIR(x) (S_IFDIR & x)
 #endif
 
-inline int chown(const char * Filename, u_int32_t uid, u_int32_t gid)
+inline int chown(const char * Filename, uint32_t uid, uint32_t gid)
 {
 	//important - this needs implementing
 	//If a large restore is required then