summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-09-23 10:56:51 +0300
committerEli Zaretskii <eliz@gnu.org>2013-09-23 10:56:51 +0300
commit55a0c0e414f3f3f2fd30b5297f072b5a973d400a (patch)
tree0f3624ca6eff06aa1bcd8bdb66c28b83deeec35c
parent8a3436c65df985bfb28a4051ae9291fdddc2a310 (diff)
downloadgunmake-55a0c0e414f3f3f2fd30b5297f072b5a973d400a.tar.gz
Fix broken w32 build due to OUTPUT_SYNC -> NO_OUTPUT_SYNC inversion.
w32/compat/posixfcn.c: Fix the forgotten OUTPUT_SYNC conditional. job.h: Ditto, but in a comment.
-rw-r--r--ChangeLog6
-rw-r--r--job.h2
-rw-r--r--w32/compat/posixfcn.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index adc87e1..c31b726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-23 Eli Zaretskii <eliz@gnu.org>
+
+ * w32/compat/posixfcn.c: Fix the forgotten OUTPUT_SYNC conditional.
+
+ * job.h: Ditto, but in a comment.
+
2013-09-22 Paul Smith <psmith@gnu.org>
* configure.ac: Update version to 3.99.92.
diff --git a/job.h b/job.h
index 29652fc..c97f7c0 100644
--- a/job.h
+++ b/job.h
@@ -80,7 +80,7 @@ typedef int sync_handle_t; /* file descriptor */
# define RECORD_SYNC_MUTEX(m) (void)(m)
# endif
-#endif /* !OUTPUT_SYNC */
+#endif /* !NO_OUTPUT_SYNC */
/* Structure describing a running or dead child process. */
diff --git a/w32/compat/posixfcn.c b/w32/compat/posixfcn.c
index 9acc1b2..627fc50 100644
--- a/w32/compat/posixfcn.c
+++ b/w32/compat/posixfcn.c
@@ -26,7 +26,7 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
#include "makeint.h"
#include "job.h"
-#ifdef OUTPUT_SYNC
+#ifdef NO_OUTPUT_SYNC
/* Support for OUTPUT_SYNC and related functionality. */
/* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */
@@ -257,7 +257,7 @@ same_stream (FILE *f1, FILE *f2)
return 0;
}
-#endif /* OUTPUT_SYNC */
+#endif /* !NO_OUTPUT_SYNC */
#if MAKE_LOAD