mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

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

Browse Source 
* 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.
This commit is contained in:
Juanma Barranquero 2012-07-07 02:20:56 +02:00
parent 82fd0d8bed
commit 07adc2c63b
7 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

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

5
lib-src/ChangeLog
View File

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

2
lib-src/makefile.w32-in
View File

@ -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) : \

25
lib/makefile.w32-in
View File

@ -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 \

7
src/ChangeLog
View File

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

2
src/makefile.w32-in
View File

@ -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) \

6
src/s/ms-w32.h
View File

@ -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