Fix Windows build as fallout from 2012-11-03T18:54:17Z!eggert@cs.ucla.edu.

 nt/config.nt (PENDING_OUTPUT_N_BYTES): Define.

 lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/fpending.$(O) and
 $(BLD)/close-stream.$(O).
 ($(BLD)/close-stream.$(O)):
 ($(BLD)/fpending.$(O)): New dependencies.

Fixes: debbugs:9574

diff --git a/ChangeLog b/ChangeLog
index 4d632fc8c33b34f0cc29daf5be76e8abb1a41200..bc37c11eb5d367eabfa1c44226bd65f8eb567aa7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-11-03  Eli Zaretskii  <eliz@gnu.org>
 
+       * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/fpending.$(O) and
+       $(BLD)/close-stream.$(O).
+       ($(BLD)/close-stream.$(O)):
+       ($(BLD)/fpending.$(O)): New dependencies.
+
        * config.bat: Copy lib/execinfo.in.h to lib/execinfo.in-h if needed.
 
 2012-11-03  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index f0cea56f829cbb5fd87077bed8be42506e5b64d0..7e807278a40244057fe40d51dc058124841be585 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -26,9 +26,11 @@ LIBS                 =
 GNULIBOBJS = $(BLD)/c-ctype.$(O) \
             $(BLD)/c-strcasecmp.$(O) \
             $(BLD)/c-strncasecmp.$(O) \
+            $(BLD)/close-stream.$(O) \
             $(BLD)/dtoastr.$(O) \
             $(BLD)/dtotimespec.$(O)  \
             $(BLD)/execinfo.$(O)  \
+            $(BLD)/fpending.$(O)  \
             $(BLD)/getopt.$(O)  \
             $(BLD)/getopt1.$(O) \
             $(BLD)/gettime.$(O) \
@@ -114,6 +116,13 @@ $(BLD)/c-strcasecmp.$(O) : \
        $(CONFIG_H) \
        $(C_CTYPE_H)
 
+$(BLD)/close-stream.$(O) : \
+       $(GNU_LIB)/close-stream.c \
+       $(GNU_LIB)/close-stream.h \
+       $(GNU_LIB)/fpending.h \
+       $(NT_INC)/stdbool.h \
+       $(CONFIG_H)
+
 $(BLD)/c-strncasecmp.$(O) : \
        $(GNU_LIB)/c-strncasecmp.c \
        $(GNU_LIB)/c-strcase.h \
@@ -135,6 +144,11 @@ $(BLD)/execinfo.$(O) : \
        $(GNU_LIB)/execinfo.h \
        $(CONFIG_H)
 
+$(BLD)/fpending.$(O) : \
+       $(GNU_LIB)/fpending.c \
+       $(GNU_LIB)/fpending.h \
+       $(CONFIG_H)
+
 $(BLD)/getopt.$(O) : \
        $(GNU_LIB)/getopt.c \
        $(GNU_LIB)/getopt.h \

diff --git a/nt/ChangeLog b/nt/ChangeLog
index d34d23df4d56d2b8cdb4143acec68fa162de2b82..e2e50f11d9b8715e704957be503cbbc99f389731 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * config.nt (PENDING_OUTPUT_N_BYTES): Define.
+
 2012-11-01  Eli Zaretskii  <eliz@gnu.org>
 
        * inc/unistd.h (setpgid, getpgrp): Provide prototypes.  (Bug#12776)

diff --git a/nt/config.nt b/nt/config.nt
index f690b126b772cb32d03fd83ec9c52e82f6f271bc..8f4cf8589108a6da6e823f97fa26e271d6a31e71 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1219,6 +1219,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Number of chars of output in the buffer of a stdio stream. */
 #undef PENDING_OUTPUT_COUNT
 
+/* the number of pending output bytes on stream 'fp' */
+#define PENDING_OUTPUT_N_BYTES  (fp->_ptr - fp->_base)
+
 /* Define to empty to suppress deprecation warnings when building with
    --enable-gcc-warnings and with libpng versions before 1.5, which lack
    png_longjmp. */