Rename NO_LOCALE_SUPPORT to JSONCPP_NO_LOCALE_SUPPORT

Gachapen · Gachapen · commit 5a821310331d · 2016-11-08T09:47:27.000+01:00
diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt
@@ -34,7 +34,7 @@ endif()
 
 if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALECONV))
 	message(WARNING "Locale functionality is not supported")
-	add_definitions(-DNO_LOCALE_SUPPORT)
+	add_definitions(-DJSONCPP_NO_LOCALE_SUPPORT)
 endif()
 
 SET( JSONCPP_INCLUDE_DIR ../../include )
diff --git a/src/lib_json/json_tool.h b/src/lib_json/json_tool.h
@@ -6,7 +6,13 @@
 #ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED
 #define LIB_JSONCPP_JSON_TOOL_H_INCLUDED
 
-#ifndef NO_LOCALE_SUPPORT
+
+// Also support old flag NO_LOCALE_SUPPORT
+#ifdef NO_LOCALE_SUPPORT
+#define JSONCPP_NO_LOCALE_SUPPORT
+#endif
+
+#ifndef JSONCPP_NO_LOCALE_SUPPORT
 #include <clocale>
 #endif
 
@@ -18,7 +24,7 @@
 
 namespace Json {
 static char getDecimalPoint() {
-#ifdef NO_LOCALE_SUPPORT
+#ifdef JSONCPP_NO_LOCALE_SUPPORT
   return '\0';
 #else
   struct lconv* lc = localeconv();
