generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-18 19:37:35 +02:00
Code Issues Projects Releases Wiki Activity

Rename NO_LOCALE_SUPPORT to JSONCPP_NO_LOCALE_SUPPORT

Browse Source
This commit is contained in:
Magnus Bjerke Vik 2016-11-08 09:46:34 +01:00
parent 1839f2da34
commit 5a82131033
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib_json/CMakeLists.txt
View File

@ -34,7 +34,7 @@ endif()
if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALECONV)) if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALECONV))
message(WARNING "Locale functionality is not supported") message(WARNING "Locale functionality is not supported")
add_definitions(-DNO_LOCALE_SUPPORT) add_definitions(-DJSONCPP_NO_LOCALE_SUPPORT)
endif() endif()
SET( JSONCPP_INCLUDE_DIR ../../include ) SET( JSONCPP_INCLUDE_DIR ../../include )

10
src/lib_json/json_tool.h
View File

@ -6,7 +6,13 @@
#ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED #ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED
#define 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> #include <clocale>
#endif #endif
@ -18,7 +24,7 @@
namespace Json { namespace Json {
static char getDecimalPoint() { static char getDecimalPoint() {
#ifdef NO_LOCALE_SUPPORT #ifdef JSONCPP_NO_LOCALE_SUPPORT
return '\0'; return '\0';
#else #else
struct lconv* lc = localeconv(); struct lconv* lc = localeconv();