From ea652fbedd3ac93d9abb24c55ff5562fbb3348fc Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Mon, 28 Mar 2016 18:47:13 +0200
Subject: Build fixes

---
 dep/protobuf/CMakeLists.txt                     | 2 +-
 src/server/bnetserver/REST/LoginRESTService.cpp | 2 +-
 src/server/bnetserver/Server/SslContext.cpp     | 2 +-
 src/server/shared/Realm/Realm.cpp               | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dep/protobuf/CMakeLists.txt b/dep/protobuf/CMakeLists.txt
index 58e295b276b..5ea6a4e188b 100644
--- a/dep/protobuf/CMakeLists.txt
+++ b/dep/protobuf/CMakeLists.txt
@@ -50,7 +50,7 @@ if (MSVC)
     src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
   )
   add_compile_options(/wd4800)
-elseif(CMAKE_COMPILER_IS_GNUCXX)
+else()
   set(protobuf_STAT_SRCS
     ${protobuf_STAT_SRCS}
     src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
diff --git a/src/server/bnetserver/REST/LoginRESTService.cpp b/src/server/bnetserver/REST/LoginRESTService.cpp
index 9ce21be9459..30b8a9fda75 100644
--- a/src/server/bnetserver/REST/LoginRESTService.cpp
+++ b/src/server/bnetserver/REST/LoginRESTService.cpp
@@ -143,7 +143,7 @@ void LoginRESTService::Run()
     {
         { "application/json;charset=utf-8", handle_post_plugin },
         { "application/json", handle_post_plugin },
-        { NULL }
+        { nullptr, nullptr }
     };
 
     soap_register_plugin_arg(&soapServer, &http_get, handle_get_plugin);
diff --git a/src/server/bnetserver/Server/SslContext.cpp b/src/server/bnetserver/Server/SslContext.cpp
index f1b2a185563..3cc62b284dc 100644
--- a/src/server/bnetserver/Server/SslContext.cpp
+++ b/src/server/bnetserver/Server/SslContext.cpp
@@ -25,7 +25,7 @@ bool Battlenet::SslContext::Initialize()
 #define LOAD_CHECK(fn) do { fn; \
     if (err) \
     { \
-        TC_LOG_ERROR("server.ssl", #fn ## "failed: %s", err.message().c_str()); \
+        TC_LOG_ERROR("server.ssl", #fn " failed: %s", err.message().c_str()); \
         return false; \
     } } while (0)
 
diff --git a/src/server/shared/Realm/Realm.cpp b/src/server/shared/Realm/Realm.cpp
index 2af537b45e5..ca331c7fe27 100644
--- a/src/server/shared/Realm/Realm.cpp
+++ b/src/server/shared/Realm/Realm.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "Realm.h"
+#include "StringFormat.h"
 
 ip::tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) const
 {
-- 
cgit v1.2.3