From a5d733f5d76c6f69780a3ed23020773c270362e7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 4 Feb 2011 11:17:36 +0200 Subject: [PATCH] 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). --- nt/ChangeLog | 4 ++++ nt/config.nt | 1 + src/ChangeLog | 5 +++++ src/makefile.w32-in | 2 ++ 4 files changed, 12 insertions(+) diff --git a/nt/ChangeLog b/nt/ChangeLog index c97903bd334..e7f005cce61 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2011-02-04 Eli Zaretskii + + * config.nt (inline) [__GNUC__]: Define (for gnulib). + 2011-01-31 Eli Zaretskii * config.nt (VERSION): Uncomment definition. diff --git a/nt/config.nt b/nt/config.nt index d612a417f4d..b5ef24fc18b 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -340,6 +340,7 @@ along with GNU Emacs. If not, see . */ /* If using GNU, then support inline function declarations. */ #ifdef __GNUC__ #define INLINE __inline__ +#define inline __inline__ #else #define INLINE #endif diff --git a/src/ChangeLog b/src/ChangeLog index a65fc5730df..992065ddfe0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-04 Eli Zaretskii + + * makefile.w32-in (IGNORE_VALUE_H): New variable. + ($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H). + 2011-02-03 Paul Eggert 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 \ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/src/config.h \ $(EMACS_ROOT)/nt/inc/sys/stat.h +IGNORE_VALUE_H = $(EMACS_ROOT)/lib/ignore-value.h $(BLD)/alloc.$(O) : \ $(SRC)/alloc.c \ @@ -1388,6 +1389,7 @@ $(BLD)/sysdep.$(O) : \ $(EMACS_ROOT)/nt/inc/sys/file.h \ $(EMACS_ROOT)/nt/inc/sys/socket.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ + $(IGNORE_VALUE_H) \ $(SRC)/lisp.h \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ -- 2.11.4.GIT