procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Eli Zaretskii 2012-11-03 22:43:29 +02:00
parent 5ccd466c82
commit 3a7089c180
4 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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>

14
lib/makefile.w32-in
View file

@ -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 \

4
nt/ChangeLog
View file

@ -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)

3
nt/config.nt
View file

@ -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. */