From 598bd93af856b2dcbfa776474b730bb4ce4249b9 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Mon, 12 May 2014 19:48:01 +0100
Subject: [PATCH] Setenv requires _gnu_source, so get the headers in the right
 order so that the feature macros are set up in config.h before any system
 header is included.

Don't update _XOPEN_SOURCE if it's already set to a high enough value.

Copied from Perforce
 Change: 186049
 ServerID: perforce.ravenbrook.com
---
 mps/code/config.h   | 8 +++++++-
 mps/code/eventtxt.c | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mps/code/config.h b/mps/code/config.h
index 1dd6a2e07f5..1792e8cbaba 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -454,6 +454,7 @@
  *
  * Source      Symbols                   Header        Feature
  * =========== ========================= ============= ====================
+ * eventtxt.c  setenv                    <stdlib.h>    _GNU_SOURCE
  * lockli.c    pthread_mutexattr_settype <pthread.h>   _XOPEN_SOURCE >= 500
  * prmci3li.c  REG_EAX etc.              <ucontext.h>  _GNU_SOURCE
  * prmci6li.c  REG_RAX etc.              <ucontext.h>  _GNU_SOURCE
@@ -472,9 +473,14 @@
 
 #if defined(MPS_OS_LI)
 
+#if defined(_XOPEN_SOURCE) && _XOPEN_SOURCE < 500
+#undef _XOPEN_SOURCE
+#endif
+#if !defined(_XOPEN_SOURCE)
 #define _XOPEN_SOURCE 500
+#endif
 
-#ifndef _GNU_SOURCE
+#if !defined(_GNU_SOURCE)
 #define _GNU_SOURCE
 #endif
 
diff --git a/mps/code/eventtxt.c b/mps/code/eventtxt.c
index bc0d550d122..01b071aee3a 100644
--- a/mps/code/eventtxt.c
+++ b/mps/code/eventtxt.c
@@ -29,13 +29,13 @@
  * $Id$
  */
 
+#include "check.h"
+#include "config.h"
+#include "eventcom.h"
+#include "eventdef.h"
 #include "mps.h"
 #include "mpsavm.h"
 #include "mpscmvff.h"
-#include "check.h"
-#include "config.h"
-#include "eventdef.h"
-#include "eventcom.h"
 #include "table.h"
 #include "testlib.h" /* for ulongest_t and associated print formats */