Update Windows port to gnulib changes in 2012-07-06T21:07:46Z!eggert@cs.ucla.edu.

* lib-src/makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)):
Update dependencies.

* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/c-ctype.$(O),
$(BLD)/c-strcasecmp.$(O) and $(BLD)/c-strncasecmp.$(O).
($(BLD)/c-ctype.$(O), $(BLD)/c-strcasecmp.$(O))
($(BLD)/c-strncasecmp.$(O)): New dependencies.

* src/makefile.w32-in (DISPEXTERN_H, $(BLD)/regex.$(O)):
Update dependencies.

* src/s/ms-w32.h [_MSC_VER]: Remove strcasecmp, strncasecmp.

7 files changed, 46 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index dc70740d303..d73c1f1b539 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/c-ctype.$(O),
+        $(BLD)/c-strcasecmp.$(O) and $(BLD)/c-strncasecmp.$(O).
+        ($(BLD)/c-ctype.$(O), $(BLD)/c-strcasecmp.$(O))
+        ($(BLD)/c-strncasecmp.$(O)): New dependencies.
+
 2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * configure.in: Document --enable-gcc-warnings better.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 56f1551e8ba..16e24b194d5 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)):
+        Update dependencies.
+
 2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 854cda371e3..98d003ac366 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -363,6 +363,7 @@ $(BLD)/ctags.$(O) : \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(SRC)/ntlib.h \
+        $(EMACS_ROOT)/lib/c-strcase.h \
         $(EMACS_ROOT)/lib/getopt.h
 
 $(BLD)/ebrowse.$(O) : \
@@ -384,6 +385,7 @@ $(BLD)/etags.$(O) : \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(SRC)/ntlib.h \
+        $(EMACS_ROOT)/lib/c-strcase.h \
         $(EMACS_ROOT)/lib/getopt.h
 
 $(BLD)/hexl.$(O) : \
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 78a0de0a0ef..f2853f10cb9 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -23,7 +23,10 @@ ALL = gnulib
 LOCAL_FLAGS     = -I. -I../nt/inc -I../src
 LIBS            =
 
-GNULIBOBJS = $(BLD)/dtoastr.$(O) \
+GNULIBOBJS = $(BLD)/c-ctype.$(O) \
+             $(BLD)/c-strcasecmp.$(O) \
+             $(BLD)/c-strncasecmp.$(O) \
+             $(BLD)/dtoastr.$(O) \
              $(BLD)/dtotimespec.$(O)  \
              $(BLD)/getopt.$(O)  \
              $(BLD)/getopt1.$(O) \
@@ -64,6 +67,26 @@ TAGS: FRC
 EMACS_ROOT      = ..
 SRC             = .
 
+$(BLD)/c-ctype.$(O) : \
+        $(SRC)/c-ctype.c \
+        $(SRC)/c-ctype.h \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/config.h
+
+$(BLD)/c-strcasecmp.$(O) : \
+        $(SRC)/c-strcasecmp.c \
+        $(SRC)/c-strcase.h \
+        $(SRC)/c-ctype.h \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/config.h
+
+$(BLD)/c-strncasecmp.$(O) : \
+        $(SRC)/c-strncasecmp.c \
+        $(SRC)/c-strcase.h \
+        $(SRC)/c-ctype.h \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/config.h
+
 $(BLD)/dtoastr.$(O) : \
         $(SRC)/dtoastr.c \
         $(SRC)/ftoastr.c \
diff --git a/src/ChangeLog b/src/ChangeLog
index 3f8cbdff476..ef2d06dc5b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (DISPEXTERN_H, $(BLD)/regex.$(O)):
+        Update dependencies.
+
+        * s/ms-w32.h [_MSC_VER]: Remove strcasecmp, strncasecmp.
+
 2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 021823cf5a4..5459224eb10 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -412,6 +412,7 @@ DIR_H          = $(NT_INC)/sys/dir.h \
 W32GUI_H       = $(SRC)/w32gui.h \
                  $(SYSTIME_H)
 DISPEXTERN_H   = $(SRC)/dispextern.h \
+                 $(GNU_LIB)/c-strcase.h \
                  $(SYSTIME_H) \
                  $(W32GUI_H)
 FILEMODE_H     = $(GNU_LIB)/filemode.h \
@@ -1269,7 +1270,6 @@ $(BLD)/regex.$(O) : \
         $(SRC)/category.h \
         $(SRC)/regex.h \
         $(SRC)/syntax.h \
-        $(NT_INC)/unistd.h \
         $(BUFFER_H) \
         $(CHARACTER_H) \
         $(CONFIG_H) \
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 866ffc9c048..1557edaa161 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -148,12 +148,6 @@ struct sigaction {
 #define MAXPATHLEN      _MAX_PATH
 #endif
 
-/* MinGW has these in its library; MSVC doesn't.  */
-#ifdef _MSC_VER
-#define strcasecmp(s1,s2)  _stricmp(s1,s2)
-#define strncasecmp(s1,s2) _strnicmp(s1,s2)
-#endif
-
 #ifdef HAVE_NTGUI
 #define HAVE_WINDOW_SYSTEM 1
 #define HAVE_MENUS 1