Set feature test macro for tests in one spot

maxmind · Aug 8, 2023 · 5b22e0f · 5b22e0f
1 parent e2c8463
commit 5b22e0f
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 71 deletions.
diff --git a/t/bad_databases_t.c b/t/bad_databases_t.c
@@ -1,8 +1,5 @@
 // This test currently does not work on Windows as nftw is
 // not available.
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
 #define _XOPEN_SOURCE 500
 #include <ftw.h>
 

diff --git a/t/bad_pointers_t.c b/t/bad_pointers_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void run_tests(int mode, const char *mode_desc) {

diff --git a/t/basic_lookup_t.c b/t/basic_lookup_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 static void test_big_lookup(void);

diff --git a/t/data-pool-t.c b/t/data-pool-t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "libtap/tap.h"
 #include "maxminddb_test_helper.h"
 #include <assert.h>

diff --git a/t/data_entry_list_t.c b/t/data_entry_list_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 MMDB_entry_data_list_s *

diff --git a/t/data_types_t.c b/t/data_types_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void test_all_data_types(MMDB_lookup_result_s *result,

diff --git a/t/dump_t.c b/t/dump_t.c
@@ -1,6 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
 #define _XOPEN_SOURCE 700
 
 #include "maxminddb_test_helper.h"

diff --git a/t/get_value_pointer_bug_t.c b/t/get_value_pointer_bug_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 /* This test exercises a bug found in MMDB_get_value for certain types of

diff --git a/t/get_value_t.c b/t/get_value_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void test_array_0_result(int status,

diff --git a/t/ipv4_start_cache_t.c b/t/ipv4_start_cache_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void test_one_ip(MMDB_s *mmdb,

diff --git a/t/ipv6_lookup_in_ipv4_t.c b/t/ipv6_lookup_in_ipv4_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void run_tests(int mode, const char *mode_desc) {

diff --git a/t/maxminddb_test_helper.c b/t/maxminddb_test_helper.c
@@ -1,14 +1,14 @@
+#include "maxminddb_test_helper.h"
+
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#define _POSIX_C_SOURCE 200112L
 #include <assert.h>
 #include <stdarg.h>
 #include <sys/types.h>
 
 #include "maxminddb.h"
-#include "maxminddb_test_helper.h"
 
 #ifdef _WIN32
 #include <io.h>

diff --git a/t/maxminddb_test_helper.h b/t/maxminddb_test_helper.h
@@ -1,6 +1,8 @@
-/* Some test files may require something newer */
-#if !defined(_GNU_SOURCE) && !defined(_POSIX_C_SOURCE)
-#define _POSIX_C_SOURCE 200112L
+// The spec says this should be set prior to including any headers, but since
+// this is test code, it should be fine to set it here. Setting it here avoids
+// setting it in every test program.
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
 #endif
 
 #if HAVE_CONFIG_H

diff --git a/t/metadata_pointers_t.c b/t/metadata_pointers_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void run_tests(int mode, const char *mode_desc) {

diff --git a/t/metadata_t.c b/t/metadata_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void test_metadata(MMDB_s *mmdb, const char *mode_desc) {

diff --git a/t/no_map_get_value_t.c b/t/no_map_get_value_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void run_tests(int mode, const char *mode_desc) {

diff --git a/t/read_node_t.c b/t/read_node_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 void test_entry_data(MMDB_s *mmdb,

diff --git a/t/threads_t.c b/t/threads_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 #include <pthread.h>
 

diff --git a/t/version_t.c b/t/version_t.c
@@ -1,7 +1,3 @@
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200809L
-#endif
-
 #include "maxminddb_test_helper.h"
 
 int main(void) {