mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-12 08:49:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Undo a bit of 2d1da5ab: handle per-thread formats for double serialization, even if --enable-threading wasn't specified.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2017-09-05 01:56:42 -04:00
parent b2afca4560
commit 548d000891
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
json_object.c
View File

@@ -703,7 +703,7 @@ int json_object_set_int64(struct json_object *jso,int64_t new_value){
/* json_object_double */ /* json_object_double */
#if defined(HAVE___THREAD) && defined(ENABLE_THREADING) #if defined(HAVE___THREAD)
// i.e. __thread or __declspec(thread) // i.e. __thread or __declspec(thread)
static SPEC___THREAD char *tls_serialization_float_format = NULL; static SPEC___THREAD char *tls_serialization_float_format = NULL;
#endif #endif
@@ -713,7 +713,7 @@ int json_c_set_serialization_double_format(const char *double_format, int global
{ {
if (global_or_thread == JSON_C_OPTION_GLOBAL) if (global_or_thread == JSON_C_OPTION_GLOBAL)
{ {
#if defined(HAVE___THREAD) && defined(ENABLE_THREADING) #if defined(HAVE___THREAD)
if (tls_serialization_float_format) if (tls_serialization_float_format)
{ {
free(tls_serialization_float_format); free(tls_serialization_float_format);
@@ -726,7 +726,7 @@ int json_c_set_serialization_double_format(const char *double_format, int global
} }
else if (global_or_thread == JSON_C_OPTION_THREAD) else if (global_or_thread == JSON_C_OPTION_THREAD)
{ {
#if defined(HAVE___THREAD) && defined(ENABLE_THREADING) #if defined(HAVE___THREAD)
if (tls_serialization_float_format) if (tls_serialization_float_format)
{ {
free(tls_serialization_float_format); free(tls_serialization_float_format);
@@ -775,7 +775,7 @@ static int json_object_double_to_json_string_format(struct json_object* jso,
{ {
const char *std_format = "%.17g"; const char *std_format = "%.17g";
#if defined(HAVE___THREAD) && defined(ENABLE_THREADING) #if defined(HAVE___THREAD)
if (tls_serialization_float_format) if (tls_serialization_float_format)
std_format = tls_serialization_float_format; std_format = tls_serialization_float_format;
else else