* nrun.c: Add #ifdef HAVE_CONFIG_H and associated includes stanza

	missing in last change.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 9fea903379080f3bddfd6679dfd0e9ed2df3de55..6e6d2fd7035ae1a29bd512d50490d2247ee1f302 100644 (file)
--- 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 8e9287982781a69c7db82e881edace9f0a56737b..aa60c42647ba9eff76ca91e61ac013450d965465 100644 (file)
--- 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.  */