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

diff --git a/nt/ChangeLog b/nt/ChangeLog
index c97903b..e7f005c 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+       * config.nt (inline) [__GNUC__]: Define (for gnulib).
+
 2011-01-31  Eli Zaretskii  <eliz@gnu.org>
 
        * config.nt (VERSION): Uncomment definition.

diff --git a/nt/config.nt b/nt/config.nt
index d612a41..b5ef24f 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -340,6 +340,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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 a65fc57..992065d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (IGNORE_VALUE_H): New variable.
+       ($(BLD)/sysdep.$(O)): Depend on $(IGNORE_VALUE_H).
+
 2011-02-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        allow C code to suppress warnings about ignored return values

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 4f7bbeb..2dd00dc 100644 (file)
--- 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 \