From: Florian Forster <octo@collectd.org>
Date: Fri, 3 Jul 2015 10:31:32 +0000 (+0200)
Subject: collectd-tg: Move _POSIX_C_SOURCE and friends to the Makefile.
X-Git-Tag: collectd-5.6.0~654
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c26f465ba20ad1d5b9a7b77dac0e6117db9377b6;p=collectd.git

collectd-tg: Move _POSIX_C_SOURCE and friends to the Makefile.

Apparently defining this in the source files confuses Solaris' libc.
Thanks to @dago for looking into this.

Hopefully fixes: #978
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 611381c4..877a785f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,7 +76,9 @@ collectdctl_LDADD += libcollectdclient/libcollectdclient.la
 collectdctl_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 
 collectd_tg_SOURCES = collectd-tg.c
-collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
+collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \
+		       -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 \
+		       -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
 collectd_tg_LDADD = daemon/libheap.la
 if BUILD_WITH_LIBSOCKET
 collectd_tg_LDADD += -lsocket
diff --git a/src/collectd-tg.c b/src/collectd-tg.c
index 501567da..760162c7 100644
--- a/src/collectd-tg.c
+++ b/src/collectd-tg.c
@@ -28,18 +28,6 @@
 # include "config.h"
 #endif
 
-#ifndef _ISOC99_SOURCE
-# define _ISOC99_SOURCE
-#endif
-
-#ifndef _POSIX_C_SOURCE
-# define _POSIX_C_SOURCE 200809L
-#endif
-
-#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE 700
-#endif
-
 #if !__GNUC__
 # define __attribute__(x) /**/
 #endif