From 548d000891ed2e24d6b0e267079a6e9a853726b8 Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Tue, 5 Sep 2017 01:56:42 -0400 Subject: [PATCH] Undo a bit of 2d1da5ab: handle per-thread formats for double serialization, even if --enable-threading wasn't specified. --- json_object.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/json_object.c b/json_object.c index fcda69f..ec4e2b6 100644 --- a/json_object.c +++ b/json_object.c @@ -703,7 +703,7 @@ int json_object_set_int64(struct json_object *jso,int64_t new_value){ /* json_object_double */ -#if defined(HAVE___THREAD) && defined(ENABLE_THREADING) +#if defined(HAVE___THREAD) // i.e. __thread or __declspec(thread) static SPEC___THREAD char *tls_serialization_float_format = NULL; #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 defined(HAVE___THREAD) && defined(ENABLE_THREADING) +#if defined(HAVE___THREAD) if (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) { -#if defined(HAVE___THREAD) && defined(ENABLE_THREADING) +#if defined(HAVE___THREAD) if (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"; -#if defined(HAVE___THREAD) && defined(ENABLE_THREADING) +#if defined(HAVE___THREAD) if (tls_serialization_float_format) std_format = tls_serialization_float_format; else -- 2.50.1