Merge branch 'gawk-4.1-stable'

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 21c5963a..ea96384d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* io.c: Move #include "popen.h" out of the HAVE_SOCKETS condition,
+	as this is needed for non-sockets builds as well.  See
+	http://lists.gnu.org/archive/html/bug-gawk/2013-06/msg00014.html
+	for the details of the problem this caused.
+
 2013-06-15         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* io.c: Add ifdefs for VMS so that it will compile again.
diff --git a/io.c b/io.c
index dad7c7b9..dc41aea3 100644
--- a/io.c
+++ b/io.c
@@ -76,10 +76,6 @@
 #include <netdb.h>
 #endif /* HAVE_NETDB_H */
 
-#if defined(HAVE_POPEN_H)
-#include "popen.h"
-#endif
-
 #ifndef HAVE_GETADDRINFO
 #include "missing_d/getaddrinfo.h"
 #endif
@@ -108,6 +104,10 @@
 #include <limits.h>
 #endif
 
+#if defined(HAVE_POPEN_H)
+#include "popen.h"
+#endif
+
 #ifdef __EMX__
 #include <process.h>
 #endif