easylogging++ patch was broken with version bump

jetwhiz · Mar 11, 2018 · 24e1c56 · 24e1c56
1 parent 3e02a82
commit 24e1c56
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/deps/easyloggingpp.patch b/deps/easyloggingpp.patch
@@ -7,23 +7,23 @@ Subject: Do not send logs to output file (easyloggingpp)
 diff --git a/src/easylogging++.h b/src/easylogging++.h
 --- a/src/easylogging++.h
 +++ b/src/easylogging++.h
-@@ -344,7 +344,10 @@
+@@ -342,7 +342,10 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
  #   include <sys/time.h>
  #elif ELPP_OS_WINDOWS
  #   include <direct.h>
 +#   define WIN32_NO_STATUS
  #   include <windows.h>
 +#   undef WIN32_NO_STATUS
 +#   include <ntstatus.h>
- #   if defined(WIN32_LEAN_AND_MEAN)
+ #  if defined(WIN32_LEAN_AND_MEAN)
  #      if defined(ELPP_WINSOCK2)
  #         include <winsock2.h>
-@@ -822,7 +825,7 @@ namespace consts {
-     static const char* kDefaultLogFile                         =      "logs/myeasylog.log";
+@@ -825,7 +828,7 @@ static const char* kDefaultLogFile                         =      "logs/myeasylo
+ static const char* kDefaultLogFile                         =      "logs/myeasylog.log";
  #      endif  // ELPP_OS_ANDROID
- #   elif ELPP_OS_WINDOWS
--    static const char* kDefaultLogFile                         =      "logs\\myeasylog.log";
-+    static const char* kDefaultLogFile                         =      "NUL";
- #   endif  // ELPP_OS_UNIX
+ #  elif ELPP_OS_WINDOWS
+-static const char* kDefaultLogFile                         =      "logs\\myeasylog.log";
++static const char* kDefaultLogFile                         =      "NUL";
+ #  endif  // ELPP_OS_UNIX
  #endif  // defined(ELPP_DEFAULT_LOG_FILE)
  #if !defined(ELPP_DISABLE_LOG_FILE_FROM_ARG)