Feature test macro review

Stop relying on default features; explicitely define the macros that
enable the symbols we need.

It appears POSIX.1 usage is fairly widespread through the code, and its
minimum required version is 2001.

We also have one GNU extension: getopt_long().

And we also have one GNU extension marked as nonstandard: timegm().
I'm going to try to remove it in a future commit.

diff --git a/src/alloc.c b/src/alloc.c
index 84c8d834ca174e50fb992f7ef6d9c7e5c0910969..78e36e7a0404369f8742e39c7ef27d21979130f3 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,3 +1,5 @@
+#define _XOPEN_SOURCE 500 /* strdup() */
+
 #include "alloc.h"
 
 #include "log.h"

diff --git a/src/asn1/asn1c/BIT_STRING.c b/src/asn1/asn1c/BIT_STRING.c
index 4e0637cd0be6e63b19ecbe1f23410dbf07881bad..ff3a4765d048aa9e381b3d22ba14257244d3985c 100644 (file)
--- a/src/asn1/asn1c/BIT_STRING.c
+++ b/src/asn1/asn1c/BIT_STRING.c
@@ -3,6 +3,8 @@
  * Redistribution and modifications are permitted subject to BSD license.
  */
 
+#define _XOPEN_SOURCE 500 /* snprintf() */
+
 #include <assert.h>
 
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/GeneralizedTime.c b/src/asn1/asn1c/GeneralizedTime.c
index 1ce990a4cc8d946d9a524b1ae85a710c4302deb1..69b7a0981bc78926f924d7d3ce352f4bf7eff368 100644 (file)
--- a/src/asn1/asn1c/GeneralizedTime.c
+++ b/src/asn1/asn1c/GeneralizedTime.c
@@ -5,12 +5,11 @@
 #define        _POSIX_PTHREAD_SEMANTICS        /* for Sun */
 #define        _REENTRANT                      /* for Sun */
 #define __EXTENSIONS__                  /* for Sun */
-#ifndef _DEFAULT_SOURCE
-#define _DEFAULT_SOURCE 1
-#endif
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE     /* for timegm(3) */
-#endif
+
+#define _DEFAULT_SOURCE 1 /* timegm() */
+#define _XOPEN_SOURCE 600 /* snprintf(), timezone */
+#define _POSIX_C_SOURCE 200112L /* gmtime_r(), localtime_r(), tzset() */
+
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/GeneralizedTime.h"
 

diff --git a/src/asn1/asn1c/OBJECT_IDENTIFIER.c b/src/asn1/asn1c/OBJECT_IDENTIFIER.c
index 1958ee1ed0e96547b96346cc555c835b412d12dc..fc40fa18a632e499a020c49a36e0fe6dfa695895 100644 (file)
--- a/src/asn1/asn1c/OBJECT_IDENTIFIER.c
+++ b/src/asn1/asn1c/OBJECT_IDENTIFIER.c
@@ -2,6 +2,9 @@
  * Copyright (c) 2003, 2004 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
+
+#define _XOPEN_SOURCE 500 /* snprintf() */
+
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/INTEGER.h"
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"

diff --git a/src/asn1/asn1c/UTCTime.c b/src/asn1/asn1c/UTCTime.c
index 8df18a0a939ec1fba87bfd531fc7c8dd8dd658b6..1c1d8790102b2857b166c88542b25529e649c7fd 100644 (file)
--- a/src/asn1/asn1c/UTCTime.c
+++ b/src/asn1/asn1c/UTCTime.c
@@ -2,6 +2,9 @@
  * Copyright (c) 2003, 2004 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
+
+#define _XOPEN_SOURCE 500 /* snprintf() */
+
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/UTCTime.h"
 #include "asn1/asn1c/GeneralizedTime.h"

diff --git a/src/asn1/asn1c/asn_bit_data.c b/src/asn1/asn1c/asn_bit_data.c
index 85602f4f915078b98230d1923046f4bba9d215b1..121f4843fdc6283f1de5484f2190b4c4957a967e 100644 (file)
--- a/src/asn1/asn1c/asn_bit_data.c
+++ b/src/asn1/asn1c/asn_bit_data.c
@@ -4,6 +4,8 @@
  * Redistribution and modifications are permitted subject to BSD license.
  */
 
+#define _XOPEN_SOURCE 500 /* snprintf() */
+
 #include <assert.h>
 
 #include "asn1/asn1c/asn_system.h"

diff --git a/src/asn1/asn1c/asn_internal.c b/src/asn1/asn1c/asn_internal.c
index 771ce94601704e4884f59a83511af68153abae10..11cd788f99f7ec12da7126a2005bc931dcd3f006 100644 (file)
--- a/src/asn1/asn1c/asn_internal.c
+++ b/src/asn1/asn1c/asn_internal.c
@@ -1,3 +1,5 @@
+#define _XOPEN_SOURCE 500 /* vsnprintf() */
+
 #include "asn1/asn1c/asn_internal.h"
 
 #include <stdarg.h>

diff --git a/src/asn1/asn1c/asn_system.h b/src/asn1/asn1c/asn_system.h
index 32c786e01a1d413926472ab39788b458e081e6a2..82b493ab5574ef744e64cba7d5b9fd3314034c1b 100644 (file)
--- a/src/asn1/asn1c/asn_system.h
+++ b/src/asn1/asn1c/asn_system.h
@@ -8,14 +8,6 @@
 #ifndef        ASN_SYSTEM_H
 #define        ASN_SYSTEM_H
 
-#ifndef _DEFAULT_SOURCE
-#define _DEFAULT_SOURCE 1
-#endif
-
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE /* for snprintf() on some linux systems  */
-#endif
-
 #include <arpa/inet.h>
 #include <inttypes.h>
 #include <limits.h>

diff --git a/src/asn1/asn1c/ber_tlv_tag.c b/src/asn1/asn1c/ber_tlv_tag.c
index 912ef1c83ba5b064aa029fc6705045ec2c27211e..ce961c0d844ec54940391c7a90694e8aad688c68 100644 (file)
--- a/src/asn1/asn1c/ber_tlv_tag.c
+++ b/src/asn1/asn1c/ber_tlv_tag.c
@@ -2,6 +2,9 @@
  * Copyright (c) 2003, 2004 Lev Walkin <vlm@lionet.info>. All rights reserved.
  * Redistribution and modifications are permitted subject to BSD license.
  */
+
+#define _XOPEN_SOURCE 500 /* snprintf() */
+
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/ber_tlv_tag.h"
 #include <errno.h>

diff --git a/src/asn1/asn1c/constraints.c b/src/asn1/asn1c/constraints.c
index 3cfbe94c646eb01af20d5b6f574ba1de63681f0f..b3325aecfdc8cf0cc5332949143307abef15a18c 100644 (file)
--- a/src/asn1/asn1c/constraints.c
+++ b/src/asn1/asn1c/constraints.c
@@ -1,3 +1,5 @@
+#define _XOPEN_SOURCE 500 /* vsnprintf() */
+
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/constraints.h"
 #include <stdarg.h>

diff --git a/src/cache/local_cache.c b/src/cache/local_cache.c
index 59b0ae79389dfc8daaef2eac4a34e220a0b89d40..b1683f11584ecc2934da9487037126506a9afefe 100644 (file)
--- a/src/cache/local_cache.c
+++ b/src/cache/local_cache.c
@@ -1,4 +1,5 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 600 /* strptime() */
+#define _POSIX_C_SOURCE 200112L /* localtime_r(), strtok_r() */
 
 #include "cache/local_cache.h"
 

diff --git a/src/config.c b/src/config.c
index 531f55003a6afcef246d75ae8f583a622874bf75..7598a6615a6ee9746b07fd440b69d7e8284178bb 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,3 +1,5 @@
+#define _GNU_SOURCE /* getopt_long() */
+
 #include "config.h"
 
 #include <getopt.h>

diff --git a/src/data_structure/path_builder.c b/src/data_structure/path_builder.c
index 0599f0323fe84fd680694c7a2e62ff471f134896..dbbbc21b6a2523de06263ee9c75b31aa530961d2 100644 (file)
--- a/src/data_structure/path_builder.c
+++ b/src/data_structure/path_builder.c
@@ -1,3 +1,5 @@
+#define _XOPEN_SOURCE 500 /* snprintf() */
+
 #include "data_structure/path_builder.h"
 
 #include <errno.h>

diff --git a/src/file.c b/src/file.c
index 816d83b6202fc4ef4158e75161bf8f6d53c56924..42013f988243e1e7921a232b686ec39510264ab8 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -1,4 +1,5 @@
-#define _XOPEN_SOURCE 500 /* nftw() */
+#define _XOPEN_SOURCE 600 /* nftw() */
+#define _POSIX_C_SOURCE 200112L /* fileno() */
 
 #include "file.h"
 

diff --git a/src/json_handler.c b/src/json_handler.c
index 19f3cd687fccfeaca3186a163b039efa180129d1..ed801ce4e004d35067aaef32fafe4d43705e2f20 100644 (file)
--- a/src/json_handler.c
+++ b/src/json_handler.c
@@ -1,3 +1,5 @@
+#define _POSIX_C_SOURCE 200112L /* strtok_r() */
+
 #include "json_handler.h"
 
 #include <errno.h>

diff --git a/src/log.c b/src/log.c
index b82370c01749369642de9e9dce05cb62b1a5d023..c4a45ed0836a5a467fd92b181717de1b5fe580d7 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -1,3 +1,6 @@
+#define _XOPEN_SOURCE 600 /* vsnprintf() */
+#define _POSIX_C_SOURCE 200112L /* localtime_r() */
+
 #include "log.h"
 
 #ifdef BACKTRACE_ENABLED

diff --git a/src/object/manifest.c b/src/object/manifest.c
index d4177d38e232aaa62e02a1aeff1bcc2d91ff26f2..07cb74eba8209340b3c7935935da34d2d88d174a 100644 (file)
--- a/src/object/manifest.c
+++ b/src/object/manifest.c
@@ -1,3 +1,5 @@
+#define _POSIX_C_SOURCE 200112L /* localtime_r() */
+
 #include "object/manifest.h"
 
 #include "algorithm.h"

diff --git a/src/rtr/rtr.c b/src/rtr/rtr.c
index c6b1a3291f44cfc8e5953e16e2266deece17f5b6..ca196c8dc3d69dfdd9711310f93760ddcca80772 100644 (file)
--- a/src/rtr/rtr.c
+++ b/src/rtr/rtr.c
@@ -1,3 +1,6 @@
+/* getaddrinfo(), freeaddrinfo(), gai_strerror() */
+#define _POSIX_C_SOURCE 200112L
+
 #include "rtr/rtr.h"
 
 #include <errno.h>

diff --git a/src/xml/relax_ng.c b/src/xml/relax_ng.c
index 00d8a109ffe28b6527236d543e2d01071b09b215..091560264d36e5fd1aeb34078816962365dce21e 100644 (file)
--- a/src/xml/relax_ng.c
+++ b/src/xml/relax_ng.c
@@ -1,3 +1,5 @@
+#define _XOPEN_SOURCE 500 /* vsnprintf() */
+
 #include "xml/relax_ng.h"
 
 #include <stdarg.h>

diff --git a/test/cache/local_cache_test.c b/test/cache/local_cache_test.c
index 84aa132da3ef9080ceb149e6376583e197655bd4..d1d926e0b044aa6d8544e877e8719893b5d566e7 100644 (file)
--- a/test/cache/local_cache_test.c
+++ b/test/cache/local_cache_test.c
@@ -1,5 +1,7 @@
 /* This test will create temporal directory "tmp/". Needs permissions. */
 
+#define _XOPEN_SOURCE 500 /* snprintf() */
+
 #include "cache/local_cache.c"
 
 #include <check.h>