Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

1 files changed, 9 insertions, 7 deletions

diff --git a/dep/g3dlite/source/Log.cpp b/dep/g3dlite/source/Log.cpp
index f437351cfbd..c113b0b0f79 100644
--- a/dep/g3dlite/source/Log.cpp
+++ b/dep/g3dlite/source/Log.cpp
@@ -14,7 +14,7 @@
 #include "G3D/FileSystem.h"
 #include <time.h>
 
-#ifdef G3D_WIN32
+#ifdef G3D_WINDOWS
     #include <imagehlp.h>
 #else
     #include <stdarg.h>
@@ -23,16 +23,16 @@
 namespace G3D {
 
 void logPrintf(const char* fmt, ...) {
-	va_list arg_list;
-	va_start(arg_list, fmt);
+    va_list arg_list;
+    va_start(arg_list, fmt);
     Log::common()->vprintf(fmt, arg_list);
     va_end(arg_list);
 }
 
 
 void logLazyPrintf(const char* fmt, ...) {
-	va_list arg_list;
-	va_start(arg_list, fmt);
+    va_list arg_list;
+    va_start(arg_list, fmt);
     Log::common()->lazyvprintf(fmt, arg_list);
     va_end(arg_list);
 }
@@ -53,7 +53,7 @@ Log::Log(const std::string& filename, int stripFromStackBottom) :
         std::string logName = base + ((ext != "") ? ("." + ext) : ""); 
 
         // Write time is greater than 1ms.  This may be a network drive.... try another file.
-        #ifdef G3D_WIN32
+        #ifdef G3D_WINDOWS
             logName = std::string(std::getenv("TEMP")) + logName;
         #else
             logName = std::string("/tmp/") + logName;
@@ -86,7 +86,9 @@ Log::~Log() {
         Log::commonLog = NULL;
     }
 
-    fclose(logFile);
+    if (logFile) {
+        FileSystem::fclose(logFile);
+    }
 }