[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108926: Update Windows port to gnuli
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108926: Update Windows port to gnulib changes in revno:108922. |
Date: |
Sat, 07 Jul 2012 02:20:56 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108926
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2012-07-07 02:20:56 +0200
message:
Update Windows port to gnulib changes in revno:108922.
* 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.
modified:
ChangeLog
lib-src/ChangeLog
lib-src/makefile.w32-in
lib/makefile.w32-in
src/ChangeLog
src/makefile.w32-in
src/s/ms-w32.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-06 21:29:50 +0000
+++ b/ChangeLog 2012-07-07 00:20:56 +0000
@@ -1,3 +1,10 @@
+2012-07-07 Juanma Barranquero <address@hidden>
+
+ * 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 <address@hidden>
* configure.in: Document --enable-gcc-warnings better.
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-07-06 21:07:46 +0000
+++ b/lib-src/ChangeLog 2012-07-07 00:20:56 +0000
@@ -1,3 +1,8 @@
+2012-07-07 Juanma Barranquero <address@hidden>
+
+ * makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)):
+ Update dependencies.
+
2012-07-06 Paul Eggert <address@hidden>
Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
=== modified file 'lib-src/makefile.w32-in'
--- a/lib-src/makefile.w32-in 2012-06-30 23:01:52 +0000
+++ b/lib-src/makefile.w32-in 2012-07-07 00:20:56 +0000
@@ -363,6 +363,7 @@
$(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 @@
$(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) : \
=== modified file 'lib/makefile.w32-in'
--- a/lib/makefile.w32-in 2012-06-26 16:57:54 +0000
+++ b/lib/makefile.w32-in 2012-07-07 00:20:56 +0000
@@ -23,7 +23,10 @@
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 @@
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 \
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-06 21:07:46 +0000
+++ b/src/ChangeLog 2012-07-07 00:20:56 +0000
@@ -1,3 +1,10 @@
+2012-07-07 Juanma Barranquero <address@hidden>
+
+ * makefile.w32-in (DISPEXTERN_H, $(BLD)/regex.$(O)):
+ Update dependencies.
+
+ * s/ms-w32.h [_MSC_VER]: Remove strcasecmp, strncasecmp.
+
2012-07-06 Paul Eggert <address@hidden>
Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in 2012-07-05 12:07:29 +0000
+++ b/src/makefile.w32-in 2012-07-07 00:20:56 +0000
@@ -412,6 +412,7 @@
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 @@
$(SRC)/category.h \
$(SRC)/regex.h \
$(SRC)/syntax.h \
- $(NT_INC)/unistd.h \
$(BUFFER_H) \
$(CHARACTER_H) \
$(CONFIG_H) \
=== modified file 'src/s/ms-w32.h'
--- a/src/s/ms-w32.h 2012-07-06 17:19:33 +0000
+++ b/src/s/ms-w32.h 2012-07-07 00:20:56 +0000
@@ -148,12 +148,6 @@
#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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108926: Update Windows port to gnulib changes in revno:108922.,
Juanma Barranquero <=