diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2012-07-07 02:20:56 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2012-07-07 02:20:56 +0200 |
| commit | 07adc2c63b17a5829879886901cb731483a469cd (patch) | |
| tree | eac3be41bbf371c67e34ee95181cabd2e73d09ae /src | |
| parent | 82fd0d8bed18ab961c9060325de4f17ed0ad94c9 (diff) | |
| download | emacs-07adc2c63b17a5829879886901cb731483a469cd.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/makefile.w32-in | 2 | ||||
| -rw-r--r-- | src/s/ms-w32.h | 6 |
3 files changed, 8 insertions, 7 deletions
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 |