4 files changed, 14 insertions, 6 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 03cddc6a035..926297b6dd3 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,13 @@
+2012-11-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (SYSWAIT_H): New macro.
+        ($(BLD)/movemail.$(O)): Update dependencies.
+
+2012-11-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for fcntl.h (Bug#12881).
+        * movemail.c, update-game-score.c: Assume <fcntl.h> exists.
+
 2012-10-26  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (uninstall): No INSTALLABLES live in archlibdir.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index f3ab4421fd3..cbd29f32cfe 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -374,6 +374,8 @@ NTLIB_H        = $(LIB_SRC)/ntlib.h \
 SYSTIME_H      = $(SRC)/systime.h \
                  $(NT_INC)/sys/time.h \
                  $(GNU_LIB)/timespec.h
+SYSWAIT_H      = $(SRC)/syswait.h \
+                 $(NT_INC)/sys/wait.h
 
 $(BLD)/ctags.$(O) : \
         $(LIB_SRC)/ctags.c \
@@ -419,14 +421,14 @@ $(BLD)/make-docfile.$(O) : \
 $(BLD)/movemail.$(O) : \
         $(LIB_SRC)/movemail.c \
         $(LIB_SRC)/pop.h \
-        $(SRC)/syswait.h \
         $(NT_INC)/pwd.h \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/stat.h \
         $(NT_INC)/unistd.h \
         $(GNU_LIB)/getopt.h \
         $(CONFIG_H) \
-        $(NTLIB_H)
+        $(NTLIB_H) \
+        $(SYSWAIT_H)
 
 $(BLD)/ntlib.$(O) : \
         $(LIB_SRC)/ntlib.c \
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 32d32e69abf..cd329a110a8 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -65,9 +65,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <getopt.h>
 #include <unistd.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 #include <string.h>
 #include "syswait.h"
 #ifdef MAIL_USE_POP
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 40397536fad..59cab61aa29 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -42,9 +42,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <time.h>
 #include <pwd.h>
 #include <ctype.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 #include <sys/stat.h>
 #include <getopt.h>