From f98f383701ea1fb6d89bf4ac5b8dcb8c9871cea4 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 11 Dec 2007 19:18:47 +0000
Subject: [PATCH] wrap some #define with #ifndef

---
 src/api/pmi.c                               | 4 +++-
 src/plugins/proctrack/pgid/proctrack_pgid.c | 4 +++-
 src/plugins/task/affinity/affinity.h        | 9 +++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/api/pmi.c b/src/api/pmi.c
index 3382656d457..ceed8a3268a 100644
--- a/src/api/pmi.c
+++ b/src/api/pmi.c
@@ -79,7 +79,9 @@
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
-#define _GNU_SOURCE
+#ifndef   _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
 
 #include <pthread.h>
 #include <signal.h>
diff --git a/src/plugins/proctrack/pgid/proctrack_pgid.c b/src/plugins/proctrack/pgid/proctrack_pgid.c
index 04880e102bb..2c77b32ee77 100644
--- a/src/plugins/proctrack/pgid/proctrack_pgid.c
+++ b/src/plugins/proctrack/pgid/proctrack_pgid.c
@@ -46,7 +46,9 @@
 #  include <inttypes.h>
 #endif
 
-#define __USE_XOPEN_EXTENDED /* getpgid */
+#ifndef   __USE_XOPEN_EXTENDED
+#  define __USE_XOPEN_EXTENDED /* getpgid */
+#endif
 #include <unistd.h>
 
 #include <sys/types.h>
diff --git a/src/plugins/task/affinity/affinity.h b/src/plugins/task/affinity/affinity.h
index b8ee34260b0..4ee3d27db12 100644
--- a/src/plugins/task/affinity/affinity.h
+++ b/src/plugins/task/affinity/affinity.h
@@ -61,8 +61,13 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
-#define _GNU_SOURCE
-#define __USE_GNU
+#ifndef   _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+#ifndef   __USE_GNU
+#define   __USE_GNU
+#endif
+
 #include <sched.h> /* SMB */
 
 #ifdef HAVE_STDLIB_H
-- 
GitLab