Merge branch 'master' into comment

1 files changed, 7 insertions, 1 deletions

diff --git a/io.c b/io.c
index 3e527da0..2a5c2e73 100644
--- a/io.c
+++ b/io.c
@@ -166,6 +166,12 @@
 # define SOCKET			int
 #endif
 
+#else /* HAVE_SOCKETS */
+
+#ifndef closemaybesocket
+# define closemaybesocket(fd)	close(fd)
+#endif
+
 #endif /* HAVE_SOCKETS */
 
 #ifndef HAVE_SETSID
@@ -3968,7 +3974,7 @@ init_output_wrapper(awk_output_buf_t *outbuf)
 	outbuf->mode = NULL;
 	outbuf->fp = NULL;
 	outbuf->opaque = NULL;
-	outbuf->redirected = false;
+	outbuf->redirected = awk_false;
 	outbuf->gawk_fwrite = gawk_fwrite;
 	outbuf->gawk_fflush = gawk_fflush;
 	outbuf->gawk_ferror = gawk_ferror;