diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | json-c.sym | 2 | ||||
| -rw-r--r-- | strerror_override_private.h | 14 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/test_strerror.c | 1 | ||||
| -rw-r--r-- | tests/test_util_file.c | 1 |
6 files changed, 2 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c917c17..7455b1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -398,7 +398,6 @@ set(JSON_C_HEADERS ${PROJECT_SOURCE_DIR}/json_object_private.h ${PROJECT_SOURCE_DIR}/random_seed.h ${PROJECT_SOURCE_DIR}/strerror_override.h - ${PROJECT_SOURCE_DIR}/strerror_override_private.h ${PROJECT_SOURCE_DIR}/math_compat.h ${PROJECT_SOURCE_DIR}/snprintf_compat.h ${PROJECT_SOURCE_DIR}/strdup_compat.h @@ -41,6 +41,8 @@ JSONC_PRIVATE { printbuf_new; printbuf_reset; sprintbuf; + # Used by tests: + _json_c_strerror; }; JSONC_0.14 { diff --git a/strerror_override_private.h b/strerror_override_private.h deleted file mode 100644 index 8726e59..0000000 --- a/strerror_override_private.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __json_strerror_override_private_h__ -#define __json_strerror_override_private_h__ - -/** - * @file - * @brief Do not use, json-c internal, may be changed or removed at any time. - */ - -#include "json_types.h" - -/* Used by tests to get consistent output */ -JSON_EXPORT int _json_c_strerror_enable; - -#endif diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index beef00a..bdee375 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -44,10 +44,6 @@ endif() foreach(TESTNAME ${ALL_TEST_NAMES}) add_executable(${TESTNAME} ${TESTNAME}.c) -if(${TESTNAME} STREQUAL test_strerror OR ${TESTNAME} STREQUAL test_util_file) -# For output consistency, we need _json_c_strerror() in some tests: -target_sources(${TESTNAME} PRIVATE ../strerror_override.c) -endif() add_test(NAME ${TESTNAME} COMMAND ${PROJECT_SOURCE_DIR}/tests/${TESTNAME}.test) # XXX using the non-target_ versions of these doesn't work :( diff --git a/tests/test_strerror.c b/tests/test_strerror.c index 57b051f..773b1aa 100644 --- a/tests/test_strerror.c +++ b/tests/test_strerror.c @@ -2,7 +2,6 @@ #undef NDEBUG #endif #include "strerror_override.h" -#include "strerror_override_private.h" #include <stdio.h> diff --git a/tests/test_util_file.c b/tests/test_util_file.c index 27a097e..036dcbc 100644 --- a/tests/test_util_file.c +++ b/tests/test_util_file.c @@ -2,7 +2,6 @@ #undef NDEBUG #endif #include "strerror_override.h" -#include "strerror_override_private.h" #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include <io.h> |