Merge commit '958721e'

src/common/filesystem/source/critsec.cpp

@@ -31,8 +31,6 @@
 **
 */
 
-namespace FileSys {
-
 #ifdef _WIN32
 
 #ifndef _WINNT_
@@ -40,6 +38,8 @@ namespace FileSys {
 #include <windows.h>
 #endif
 
+namespace FileSys {
+
 class FInternalCriticalSection
 {
 public:
@@ -82,6 +82,8 @@ void LeaveCriticalSection(FInternalCriticalSection *c)
 
 #include <pthread.h>
 
+namespace FileSys {
+
 class FInternalCriticalSection
 {
 public:

src/common/filesystem/source/fs_findfile.cpp

@@ -35,6 +35,7 @@
 #include "fs_findfile.h"
 #include <string.h>
 #include <vector>
+#include <sys/stat.h>
 
 #ifndef _WIN32
 
@@ -45,8 +46,6 @@
 #endif
 #include <unistd.h>
 #include <fnmatch.h>
-#include <sys/stat.h>
-
 #include <dirent.h>
 
 #else