diff options
| -rw-r--r-- | external/easylogging++/easylogging++.h | 2 | ||||
| -rw-r--r-- | src/serialization/json_object.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 03d62bfb6..0b65461bc 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -127,6 +127,8 @@ #endif #if defined(__EMSCRIPTEN__) # define ELPP_OS_EMSCRIPTEN 1 +#else +# define ELPP_OS_EMSCRIPTEN 0 #endif #if (defined(__DragonFly__)) # define ELPP_OS_DRAGONFLY 1 diff --git a/src/serialization/json_object.h b/src/serialization/json_object.h index d2c579589..a1a5105d5 100644 --- a/src/serialization/json_object.h +++ b/src/serialization/json_object.h @@ -30,11 +30,11 @@ #include <boost/utility/string_ref.hpp> #include <cstring> +#include "string_tools.h" // out of order because windows.h GetObject macro conflicts with GenericValue<..>::GetObject() #include <rapidjson/document.h> #include <rapidjson/stringbuffer.h> #include <rapidjson/writer.h> -#include "string_tools.h" #include "cryptonote_basic/cryptonote_basic.h" #include "rpc/message_data_structs.h" #include "cryptonote_protocol/cryptonote_protocol_defs.h" |