6 files changed, 39 insertions, 16 deletions

diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt
index 0d3c9a63e..d1db0373d 100644
--- a/src/OSSupport/CMakeLists.txt
+++ b/src/OSSupport/CMakeLists.txt
@@ -41,6 +41,10 @@ SET (HDRS
 	UDPEndpointImpl.h
 )
 
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	add_flags_cxx("-Wno-error=global-constructors -Wno-error=old-style-cast")
+endif()
+
 if(NOT MSVC)
 	add_library(OSSupport ${SRCS} ${HDRS})
 
diff --git a/src/OSSupport/Errors.cpp b/src/OSSupport/Errors.cpp
index a5361e1a6..407799495 100644
--- a/src/OSSupport/Errors.cpp
+++ b/src/OSSupport/Errors.cpp
@@ -22,7 +22,7 @@ AString GetOSErrorString( int a_ErrNo)
 	
 	// According to http://linux.die.net/man/3/strerror_r there are two versions of strerror_r():
 	
-	#if !defined(__APPLE__) && ( _GNU_SOURCE) && !defined(ANDROID_NDK)  // GNU version of strerror_r()
+	#if !defined(__APPLE__) && defined( _GNU_SOURCE) && !defined(ANDROID_NDK)  // GNU version of strerror_r()
 	
 	char * res = strerror_r( errno, buffer, ARRAYCOUNT(buffer));
 	if (res != nullptr)
diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp
index 43105b230..6327b3505 100644
--- a/src/OSSupport/File.cpp
+++ b/src/OSSupport/File.cpp
@@ -180,7 +180,7 @@ int cFile::Write(const void * iBuffer, size_t iNumBytes)
 
 
 
-int cFile::Seek (int iPosition)
+long cFile::Seek (int iPosition)
 {
 	ASSERT(IsOpen());
 	
@@ -193,7 +193,7 @@ int cFile::Seek (int iPosition)
 	{
 		return -1;
 	}
-	return (int)ftell(m_File);
+	return ftell(m_File);
 }
 
 
@@ -201,7 +201,7 @@ int cFile::Seek (int iPosition)
 
 
 
-int cFile::Tell (void) const
+long cFile::Tell (void) const
 {
 	ASSERT(IsOpen());
 	
@@ -210,14 +210,14 @@ int cFile::Tell (void) const
 		return -1;
 	}
 	
-	return (int)ftell(m_File);
+	return ftell(m_File);
 }
 
 
 
 
 
-int cFile::GetSize(void) const
+long cFile::GetSize(void) const
 {
 	ASSERT(IsOpen());
 	
@@ -226,7 +226,7 @@ int cFile::GetSize(void) const
 		return -1;
 	}
 	
-	int CurPos = Tell();
+	long CurPos = Tell();
 	if (CurPos < 0)
 	{
 		return -1;
@@ -235,7 +235,7 @@ int cFile::GetSize(void) const
 	{
 		return -1;
 	}
-	int res = Tell();
+	long res = Tell();
 	if (fseek(m_File, (long)CurPos, SEEK_SET) != 0)
 	{
 		return -1;
@@ -256,7 +256,19 @@ int cFile::ReadRestOfFile(AString & a_Contents)
 		return -1;
 	}
 	
-	size_t DataSize = GetSize() - Tell();
+	long TotalSize = GetSize();
+	if (TotalSize < 0)
+	{
+		return -1;
+	}
+
+	long Position = Tell();
+	if (Position < 0)
+	{
+		return -1;
+	}
+
+	auto DataSize = static_cast<size_t>(TotalSize - Position);
 	
 	// HACK: This depends on the internal knowledge that AString's data() function returns the internal buffer directly
 	a_Contents.assign(DataSize, '\0');
@@ -349,7 +361,7 @@ bool cFile::IsFile(const AString & a_Path)
 
 
 
-int cFile::GetSize(const AString & a_FileName)
+long cFile::GetSize(const AString & a_FileName)
 {
 	struct stat st;
 	if (stat(a_FileName.c_str(), &st) == 0)
diff --git a/src/OSSupport/File.h b/src/OSSupport/File.h
index 1b5e71a17..6281d1494 100644
--- a/src/OSSupport/File.h
+++ b/src/OSSupport/File.h
@@ -87,13 +87,13 @@ public:
 	int Write(const void * iBuffer, size_t iNumBytes);
 	
 	/** Seeks to iPosition bytes from file start, returns old position or -1 for failure; asserts if not open */
-	int Seek (int iPosition);
+	long Seek (int iPosition);
 	
 	/** Returns the current position (bytes from file start) or -1 for failure; asserts if not open */
-	int Tell (void) const;
+	long Tell (void) const;
 	
 	/** Returns the size of file, in bytes, or -1 for failure; asserts if not open */
-	int GetSize(void) const;
+	long GetSize(void) const;
 	
 	/** Reads the file from current position till EOF into an AString; returns the number of bytes read or -1 for error */
 	int ReadRestOfFile(AString & a_Contents);
@@ -119,7 +119,7 @@ public:
 	static bool IsFile(const AString & a_Path);
 	
 	/** Returns the size of the file, or a negative number on error */
-	static int GetSize(const AString & a_FileName);
+	static long GetSize(const AString & a_FileName);
 	
 	/** Creates a new folder with the specified name. Returns true if successful. Path may be relative or absolute */
 	static bool CreateFolder(const AString & a_FolderPath);
diff --git a/src/OSSupport/GZipFile.h b/src/OSSupport/GZipFile.h
index dfb4e8c31..286c98aff 100644
--- a/src/OSSupport/GZipFile.h
+++ b/src/OSSupport/GZipFile.h
@@ -37,7 +37,7 @@ public:
 	int ReadRestOfFile(AString & a_Contents);
 	
 	/// Writes a_Contents into file, compressing it along the way. Returns true if successful. Multiple writes are supported.
-	bool Write(const AString & a_Contents) { return Write(a_Contents.data(), (int)(a_Contents.size())); }
+	bool Write(const AString & a_Contents) { return Write(a_Contents.data(), static_cast<int>(a_Contents.size())); }
 	
 	bool Write(const char * a_Data, int a_Size);
 	
diff --git a/src/OSSupport/StackTrace.cpp b/src/OSSupport/StackTrace.cpp
index 015a53ba0..1ec10f20e 100644
--- a/src/OSSupport/StackTrace.cpp
+++ b/src/OSSupport/StackTrace.cpp
@@ -12,6 +12,13 @@
 	#include <unistd.h>
 #endif
 
+// FreeBSD uses size_t for the return type of backtrace()
+#if defined(__FreeBSD__) && (__FreeBSD__ >= 10)
+	#define btsize size_t
+#else
+	#define btsize int
+#endif
+
 
 
 
@@ -34,7 +41,7 @@ void PrintStackTrace(void)
 		// Use the backtrace() function to get and output the stackTrace:
 		// Code adapted from http://stackoverflow.com/questions/77005/how-to-generate-a-stacktrace-when-my-gcc-c-app-crashes
 		void * stackTrace[30];
-		int numItems = backtrace(stackTrace, ARRAYCOUNT(stackTrace));
+		btsize numItems = backtrace(stackTrace, ARRAYCOUNT(stackTrace));
 		backtrace_symbols_fd(stackTrace, numItems, STDERR_FILENO);
 	#endif
 }