Merge branch 'gawk-4.1-stable'

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 57ae9708..e76e541a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* io.c (inetfile): Change return type to bool.  Wrap code
+	with ifdef HAVE_SOCKETS so that it'll compile on DJGPP.
+
 2014-05-22         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	Allow any redirected getline inside BEGINFILE/ENDFILE.
diff --git a/io.c b/io.c
index 3d7b00ab..57d4af22 100644
--- a/io.c
+++ b/io.c
@@ -296,7 +296,7 @@ struct inet_socket_info {
 	} localport, remotehost, remoteport;
 };
 
-static int inetfile(const char *str, struct inet_socket_info *isn);
+static bool inetfile(const char *str, struct inet_socket_info *isn);
 
 static NODE *in_PROCINFO(const char *pidx1, const char *pidx2, NODE **full_idx);
 static long get_read_timeout(IOBUF *iop);
@@ -3723,9 +3723,12 @@ free_rp(struct redirect *rp)
 
 /* inetfile --- return true for a /inet special file, set other values */
 
-static int
+static bool
 inetfile(const char *str, struct inet_socket_info *isi)
 {
+#ifndef HAVE_SOCKETS
+	return false;
+#else
 	const char *cp = str;
 	struct inet_socket_info buf;
 
@@ -3805,6 +3808,7 @@ inetfile(const char *str, struct inet_socket_info *isi)
 		fatal(_("IPv6 communication is not supported"));
 #endif
 	return true;
+#endif /* HAVE_SOCKETS */
 }
 
 /*