summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-03-22 12:51:09 +1100
committerDarren Tucker <dtucker@zip.com.au>2013-03-22 12:51:09 +1100
commit221b4b2436ac78a65c3b775c25ccd396a1fed208 (patch)
tree430402b1d4b760da62f9d16a066c68bd94d54d14
parentc8a0f27c6d761d1335d13ed84d773e9ddf1d95c8 (diff)
- (dtucker) [includes.h] Check if _GNU_SOURCE is already defined before
defining it again. Prevents warnings if someone, eg, sets it in CFLAGS.
-rw-r--r--ChangeLog2
-rw-r--r--includes.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c13bb9b..ce612d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
Hands' greatly revised version.
- (djm) Release 6.2p1
- (dtucker) [configure.ac] Add stdlib.h to zlib check for exit() prototype.
+ - (dtucker) [includes.h] Check if _GNU_SOURCE is already defined before
+ defining it again. Prevents warnings if someone, eg, sets it in CFLAGS.
20120318
- (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c]
diff --git a/includes.h b/includes.h
index 3e206c89..07bcd89f 100644
--- a/includes.h
+++ b/includes.h
@@ -18,7 +18,9 @@
#include "config.h"
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE /* activate extra prototypes for glibc */
+#endif
#include <sys/types.h>
#include <sys/socket.h> /* For CMSG_* */