Remove all _xxx_SOURCE macros from source, do it in configure.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
sailfishos-mirror · Nov 5, 2011 · dcc7437 · dcc7437
1 parent e8f6d53
commit dcc7437
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 11 deletions.
diff --git a/auth.c b/auth.c
@@ -23,7 +23,6 @@
  *   Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <netdb.h>
 #include <unistd.h>

diff --git a/configure.ac b/configure.ac
@@ -2,6 +2,7 @@
 AC_INIT(openconnect, 3.13)
 PKG_PROG_PKG_CONFIG
 AC_LANG_C
+AC_CANONICAL_TARGET
 AM_MAINTAINER_MODE([enable])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -49,6 +50,28 @@ if test "$USE_NLS" = "yes"; then
 fi
 AM_CONDITIONAL(USE_NLS, [test "$USE_NLS" = "yes"])
 
+case $target_os in
+ *linux*)
+    AC_MSG_NOTICE([Applying feature macros for Linux build])
+    AC_DEFINE(_POSIX_C_SOURCE, 200112L)
+    # For strcasecmp() 
+    AC_DEFINE(_BSD_SOURCE)
+    # For asprintf()
+    AC_DEFINE(_GNU_SOURCE)
+    ;;
+ *netbsd*)
+    AC_MSG_NOTICE([Applying feature macros for NetBSD build])
+    AC_DEFINE(_POSIX_C_SOURCE, 200112L)
+    AC_DEFINE(_NETBSD_SOURCE)
+    ;;
+ *)
+    # On FreeBSD the only way to get vsyslog() visible is to define
+    #  *nothing*, which makes absolutely everything visible.
+    # On Darwin enabling _POSIX_C_SOURCE breaks <sys/mount.h> because
+    # u_long and other types don't get defined. OpenBSD is similar.
+    ;;
+esac
+
 AS_COMPILER_FLAGS(CFLAGS,
         "-Wall
          -Wextra

diff --git a/cstp.c b/cstp.c
@@ -23,7 +23,6 @@
  *   Boston, MA 02110-1301 USA
  */
 
-#define _BSD_SOURCE
 #include <netdb.h>
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/dtls.c b/dtls.c
@@ -22,7 +22,6 @@
  *   Boston, MA 02110-1301 USA
  */
 
-#define _BSD_SOURCE
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/http.c b/http.c
@@ -23,7 +23,6 @@
  *   Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include <netdb.h>
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/main.c b/main.c
@@ -23,8 +23,6 @@
  *   Boston, MA 02110-1301 USA
  */
 
-#define _BSD_SOURCE
-#define _POSIX_SOURCE
 #include <stdio.h>
 #ifdef ANDROID
 #include <android/log.h>
@@ -49,7 +47,6 @@
 #include LIBPROXY_HDR
 #endif
 
-#define _GNU_SOURCE
 #include <getopt.h>
 
 #include "openconnect-internal.h"

diff --git a/mainloop.c b/mainloop.c
@@ -22,7 +22,6 @@
  *   Boston, MA 02110-1301 USA
  */
 
-#define _POSIX_SOURCE
 #include <errno.h>
 #include <poll.h>
 #include <limits.h>

diff --git a/ssl.c b/ssl.c
@@ -22,7 +22,6 @@
  *   Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>

diff --git a/tun.c b/tun.c
@@ -22,8 +22,6 @@
  *   Boston, MA 02110-1301 USA
  */
 
-#define _BSD_SOURCE
-#define _POSIX_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>