Merge branch 'master' into HTTPSizeT

Conflicts:
	src/HTTPServer/EnvelopeParser.h
	src/HTTPServer/HTTPFormParser.h
	src/HTTPServer/MultipartParser.h

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 ( _GNU_SOURCE ) && !defined(ANDROID_NDK)  // GNU version of strerror_r()
+	#if !defined(__APPLE__) && ( _GNU_SOURCE ) && !defined(ANDROID_NDK)  // GNU version of strerror_r()
 	
 	char * res = strerror_r( errno, buffer, ARRAYCOUNT(buffer) );
 	if( res != NULL )

src/OSSupport/Sleep.h

@@ -4,4 +4,4 @@ class cSleep
 {
 public:
 	static void MilliSleep( unsigned int a_MilliSeconds );
-};
+};

src/OSSupport/Thread.h

@@ -23,4 +23,4 @@ private:
 	cEvent* m_StopEvent;
 
 	AString m_ThreadName;
-};
+};