aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorEli Zaretskii2012-11-03 22:43:29 +0200
committerEli Zaretskii2012-11-03 22:43:29 +0200
commit3a7089c180e0fdaf7b72514079dc3bdf3627ecfd (patch)
treeabb7f0195615d0dc4008b1e05ad3c603322ea5f6 /nt
parent5ccd466c8249e954f140aff34c6e0f4f4d2751d5 (diff)
downloademacs-3a7089c180e0fdaf7b72514079dc3bdf3627ecfd.tar.gz
emacs-3a7089c180e0fdaf7b72514079dc3bdf3627ecfd.zip
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
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/config.nt3
2 files changed, 7 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index d34d23df4d5..e2e50f11d9b 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12012-11-03 Eli Zaretskii <eliz@gnu.org>
2
3 * config.nt (PENDING_OUTPUT_N_BYTES): Define.
4
12012-11-01 Eli Zaretskii <eliz@gnu.org> 52012-11-01 Eli Zaretskii <eliz@gnu.org>
2 6
3 * inc/unistd.h (setpgid, getpgrp): Provide prototypes. (Bug#12776) 7 * inc/unistd.h (setpgid, getpgrp): Provide prototypes. (Bug#12776)
diff --git a/nt/config.nt b/nt/config.nt
index f690b126b77..8f4cf858910 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1219,6 +1219,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1219/* Number of chars of output in the buffer of a stdio stream. */ 1219/* Number of chars of output in the buffer of a stdio stream. */
1220#undef PENDING_OUTPUT_COUNT 1220#undef PENDING_OUTPUT_COUNT
1221 1221
1222/* the number of pending output bytes on stream 'fp' */
1223#define PENDING_OUTPUT_N_BYTES (fp->_ptr - fp->_base)
1224
1222/* Define to empty to suppress deprecation warnings when building with 1225/* Define to empty to suppress deprecation warnings when building with
1223 --enable-gcc-warnings and with libpng versions before 1.5, which lack 1226 --enable-gcc-warnings and with libpng versions before 1.5, which lack
1224 png_longjmp. */ 1227 png_longjmp. */