[Emacs-diffs] /srv/bzr/emacs/trunk r110789: Fix Windows build as fallout from revision 110786.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110789
fixes bug: http://debbugs.gnu.org/9574
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-03 22:43:29 +0200
message:
  Fix Windows build as fallout from revision 110786.
  
   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.
modified:
  ChangeLog
  lib/makefile.w32-in
  nt/ChangeLog
  nt/config.nt

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-11-03 19:14:22 +0000
+++ b/ChangeLog 2012-11-03 20:43:29 +0000
@@ -1,5 +1,10 @@
 2012-11-03  Eli Zaretskii  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lib/makefile.w32-in'
--- a/lib/makefile.w32-in       2012-08-25 10:04:17 +0000
+++ b/lib/makefile.w32-in       2012-11-03 20:43:29 +0000
@@ -26,9 +26,11 @@
 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 @@
        $(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 @@
        $(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 \

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-11-01 14:21:45 +0000
+++ b/nt/ChangeLog      2012-11-03 20:43:29 +0000
@@ -1,3 +1,7 @@
+2012-11-03  Eli Zaretskii  <address@hidden>
+
+       * config.nt (PENDING_OUTPUT_N_BYTES): Define.
+
 2012-11-01  Eli Zaretskii  <address@hidden>
 
        * inc/unistd.h (setpgid, getpgrp): Provide prototypes.  (Bug#12776)

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-11-02 00:48:12 +0000
+++ b/nt/config.nt      2012-11-03 20:43:29 +0000
@@ -1219,6 +1219,9 @@
 /* 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. */