From f914e38494c6f9979337a59c26d57117111b6125 Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@axis.com>
Date: Sat, 24 Mar 2012 09:31:09 +0000
Subject: [PATCH] 	* nrun.c: Add #ifdef HAVE_CONFIG_H and associated
 includes stanza 	missing in last change.

---
 sim/common/ChangeLog | 5 +++++
 sim/common/nrun.c    | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 9fea903..6e6d2fd 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-24  Hans-Peter Nilsson  <hp@axis.com>
+
+	* nrun.c: Add #ifdef HAVE_CONFIG_H and associated includes stanza
+	missing in last change.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* acinclude.m4 (SIM_AC_COMMON): Call AC_USE_SYSTEM_EXTENSIONS.
diff --git a/sim/common/nrun.c b/sim/common/nrun.c
index 8e92879..aa60c42 100644
--- a/sim/common/nrun.c
+++ b/sim/common/nrun.c
@@ -14,6 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* Need to be before general includes, to pick up e.g. _GNU_SOURCE.  */
+#ifdef HAVE_CONFIG_H
+#include "cconfig.h"
+#include "tconfig.h"
+#endif
+
 #include <signal.h>
 
 /* For strsignal.  */
-- 
2.7.4