From 3ce41446a66275bee1599b51aa3c47e2e0ae1b32 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Mon, 22 Aug 2011 15:35:13 -0700
Subject: [PATCH] Define _GNU_SOURCE in src/Makefile.am

We end up needing _GNU_SOURCE in a bunch of places-- to get direct i/o,
pipe2, and some other Linux-specific interfaces.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---
 qa/workunits/direct_io/direct_io_test.c      | 1 -
 qa/workunits/direct_io/test_short_dio_read.c | 1 -
 qa/workunits/direct_io/test_sync_io.c        | 3 ---
 src/Makefile.am                              | 2 +-
 src/common/HeartbeatMap.cc                   | 4 ----
 src/common/pipe.c                            | 4 ----
 src/common/sync_filesystem.h                 | 3 ---
 src/test/gprof-helper.c                      | 1 -
 8 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/qa/workunits/direct_io/direct_io_test.c b/qa/workunits/direct_io/direct_io_test.c
index 3ad6592cba3ae..ccfbbb86079d1 100644
--- a/qa/workunits/direct_io/direct_io_test.c
+++ b/qa/workunits/direct_io/direct_io_test.c
@@ -9,7 +9,6 @@
  * Foundation.  See file COPYING.
  *
  */
-#define _GNU_SOURCE // for O_DIRECT
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/qa/workunits/direct_io/test_short_dio_read.c b/qa/workunits/direct_io/test_short_dio_read.c
index e262201e3ebf2..7cc43959747cf 100644
--- a/qa/workunits/direct_io/test_short_dio_read.c
+++ b/qa/workunits/direct_io/test_short_dio_read.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/qa/workunits/direct_io/test_sync_io.c b/qa/workunits/direct_io/test_sync_io.c
index a5e4713c70d97..1a84fee55c99c 100644
--- a/qa/workunits/direct_io/test_sync_io.c
+++ b/qa/workunits/direct_io/test_sync_io.c
@@ -1,6 +1,3 @@
-
-#define _GNU_SOURCE
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 3869f546b4377..52b6ae3aa4135 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -659,7 +659,7 @@ CLEANFILES += \
 ##
 
 AM_COMMON_FLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT \
--D_THREAD_SAFE -D__STDC_FORMAT_MACROS -rdynamic \
+-D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -rdynamic \
 ${WARN_TYPE_LIMITS} ${WARN_IGNORED_QUALIFIERS} -Winit-self -Wpointer-arith \
 -fno-strict-aliasing
 
diff --git a/src/common/HeartbeatMap.cc b/src/common/HeartbeatMap.cc
index ca1aaea46d5bf..99970e4237ebe 100644
--- a/src/common/HeartbeatMap.cc
+++ b/src/common/HeartbeatMap.cc
@@ -12,10 +12,6 @@
  * 
  */
 
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
 #include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/common/pipe.c b/src/common/pipe.c
index 0cfdb519ddb31..312f486f7a0c9 100644
--- a/src/common/pipe.c
+++ b/src/common/pipe.c
@@ -12,10 +12,6 @@
  *
  */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE /* need for pipe2 */
-#endif
-
 #include "common/pipe.h"
 
 #include <errno.h>
diff --git a/src/common/sync_filesystem.h b/src/common/sync_filesystem.h
index 78afdf13479fa..04cfc99939017 100644
--- a/src/common/sync_filesystem.h
+++ b/src/common/sync_filesystem.h
@@ -15,9 +15,6 @@
 #ifndef CEPH_SYNC_FILESYSTEM_H
 #define CEPH_SYNC_FILESYSTEM_H
 
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
 #include <unistd.h>
 
 inline int sync_filesystem(int fd)
diff --git a/src/test/gprof-helper.c b/src/test/gprof-helper.c
index 9f013ba5b630e..a64c406ec26e3 100644
--- a/src/test/gprof-helper.c
+++ b/src/test/gprof-helper.c
@@ -15,7 +15,6 @@
  * LD_PRELOAD=./gprof-helper.so your_program
  */
 
-#define _GNU_SOURCE
 #include <sys/time.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
2.39.5