aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-02-04 11:17:36 +0200
committerEli Zaretskii2011-02-04 11:17:36 +0200
commita5d733f5d76c6f69780a3ed23020773c270362e7 (patch)
tree839b4eda47ed3ab7818b8048aed07679a3164a65 /src
parent6f52d86e958f763406796ed2f97f2b4a678f4166 (diff)
downloademacs-a5d733f5d76c6f69780a3ed23020773c270362e7.tar.gz
emacs-a5d733f5d76c6f69780a3ed23020773c270362e7.zip
Adapt to addition of ignore-value.h in 2011-02-03T19:29:35Z!eggert@cs.ucla.edu.
src/makefile.w32-in (IGNORE_VALUE_H): New variable. ($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H). nt/config.nt (inline) [__GNUC__]: Define (for gnulib).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/makefile.w32-in2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a65fc5730df..992065ddfe0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-02-04 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (IGNORE_VALUE_H): New variable.
4 ($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
5
12011-02-03 Paul Eggert <eggert@cs.ucla.edu> 62011-02-03 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 allow C code to suppress warnings about ignored return values 8 allow C code to suppress warnings about ignored return values
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 4f7bbebf6cb..2dd00dcc876 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -347,6 +347,7 @@ CONFIG_H = $(EMACS_ROOT)/src/s/ms-w32.h \
347 $(EMACS_ROOT)/src/m/intel386.h \ 347 $(EMACS_ROOT)/src/m/intel386.h \
348 $(EMACS_ROOT)/src/config.h \ 348 $(EMACS_ROOT)/src/config.h \
349 $(EMACS_ROOT)/nt/inc/sys/stat.h 349 $(EMACS_ROOT)/nt/inc/sys/stat.h
350IGNORE_VALUE_H = $(EMACS_ROOT)/lib/ignore-value.h
350 351
351$(BLD)/alloc.$(O) : \ 352$(BLD)/alloc.$(O) : \
352 $(SRC)/alloc.c \ 353 $(SRC)/alloc.c \
@@ -1388,6 +1389,7 @@ $(BLD)/sysdep.$(O) : \
1388 $(EMACS_ROOT)/nt/inc/sys/file.h \ 1389 $(EMACS_ROOT)/nt/inc/sys/file.h \
1389 $(EMACS_ROOT)/nt/inc/sys/socket.h \ 1390 $(EMACS_ROOT)/nt/inc/sys/socket.h \
1390 $(EMACS_ROOT)/nt/inc/sys/time.h \ 1391 $(EMACS_ROOT)/nt/inc/sys/time.h \
1392 $(IGNORE_VALUE_H) \
1391 $(SRC)/lisp.h \ 1393 $(SRC)/lisp.h \
1392 $(SRC)/atimer.h \ 1394 $(SRC)/atimer.h \
1393 $(SRC)/blockinput.h \ 1395 $(SRC)/blockinput.h \