[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109389: Move NT-specific include fil
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109389: Move NT-specific include file to the NT include directory |
Date: |
Wed, 01 Aug 2012 23:19:48 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109389
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-01 23:19:48 -0700
message:
Move NT-specific include file to the NT include directory
* nt/inc/ms-w32.h: Move here from ../src/s.
* nt/config.nt (config_opsysfile): Change to <ms-w32.h>.
* s/ms-w32.h: Move to ../nt/inc.
* src/makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H):
Update for new ms-w32.h location.
* lib-src/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
* lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
* lisp/emacs-lisp/authors.el (authors-renamed-files-alist): Add ms-w32.h.
renamed:
src/s/ms-w32.h => nt/inc/ms-w32.h
modified:
ChangeLog
lib-src/ChangeLog
lib-src/makefile.w32-in
lib/makefile.w32-in
lisp/ChangeLog
lisp/emacs-lisp/authors.el
nt/ChangeLog
nt/config.nt
src/ChangeLog
src/makefile.w32-in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-02 04:46:10 +0000
+++ b/ChangeLog 2012-08-02 06:19:48 +0000
@@ -1,3 +1,7 @@
+2012-08-02 Glenn Morris <address@hidden>
+
+ * lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
+
2012-08-02 Paul Eggert <address@hidden>
Merge from gnulib (Bug#12116), incorporating:
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-08-01 17:54:06 +0000
+++ b/lib-src/ChangeLog 2012-08-02 06:19:48 +0000
@@ -1,3 +1,7 @@
+2012-08-02 Glenn Morris <address@hidden>
+
+ * makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
+
2012-08-01 Glenn Morris <address@hidden>
* Makefile.in (config_h): New variable.
=== modified file 'lib-src/makefile.w32-in'
--- a/lib-src/makefile.w32-in 2012-08-01 00:29:59 +0000
+++ b/lib-src/makefile.w32-in 2012-08-02 06:19:48 +0000
@@ -360,7 +360,7 @@
NT_INC = $(EMACS_ROOT)/nt/inc
GNU_LIB = $(EMACS_ROOT)/lib
-MS_W32_H = $(SRC)/s/ms-w32.h \
+MS_W32_H = $(NT_INC)/ms-w32.h \
$(NT_INC)/sys/stat.h
CONF_POST_H = $(SRC)/conf_post.h \
$(MS_W32_H)
=== modified file 'lib/makefile.w32-in'
--- a/lib/makefile.w32-in 2012-08-01 00:29:59 +0000
+++ b/lib/makefile.w32-in 2012-08-02 06:19:48 +0000
@@ -1,5 +1,5 @@
# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@@ -71,7 +71,7 @@
C_CTYPE_H = $(GNU_LIB)/c-ctype.h \
$(NT_INC)/stdbool.h
-MS_W32_H = $(SRC)/s/ms-w32.h \
+MS_W32_H = $(NT_INC)/ms-w32.h \
$(NT_INC)/sys/stat.h
CONF_POST_H = $(SRC)/conf_post.h \
$(MS_W32_H)
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-08-02 01:36:14 +0000
+++ b/lisp/ChangeLog 2012-08-02 06:19:48 +0000
@@ -1,3 +1,7 @@
+2012-08-02 Glenn Morris <address@hidden>
+
+ * emacs-lisp/authors.el (authors-renamed-files-alist): Add ms-w32.h.
+
2012-08-02 Paul Eggert <address@hidden>
Obsolete alias inactivate-current-input-method-function (Bug#10150).
=== modified file 'lisp/emacs-lisp/authors.el'
--- a/lisp/emacs-lisp/authors.el 2012-07-10 01:11:08 +0000
+++ b/lisp/emacs-lisp/authors.el 2012-08-02 06:19:48 +0000
@@ -578,6 +578,7 @@
("w32console.c" . "w32term.c")
("unexnt.c" . "unexw32.c")
("s/windowsnt.h" . "s/ms-w32.h")
+ ("s/ms-w32.h" . "inc/ms-w32.h")
("winnt.el" . "w32-fns.el")
("config.emacs" . "configure")
("configure.in" . "configure.ac")
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2012-08-01 11:20:07 +0000
+++ b/nt/ChangeLog 2012-08-02 06:19:48 +0000
@@ -1,3 +1,8 @@
+2012-08-02 Glenn Morris <address@hidden>
+
+ * inc/ms-w32.h: Move here from ../src/s.
+ * config.nt (config_opsysfile): Change to <ms-w32.h>.
+
2012-08-01 Juanma Barranquero <address@hidden>
* config.nt: Sync with autogen/config.in.
=== modified file 'nt/config.nt'
--- a/nt/config.nt 2012-08-01 11:20:07 +0000
+++ b/nt/config.nt 2012-08-02 06:19:48 +0000
@@ -22,7 +22,7 @@
This file is intentionally kept in sync with autogen/config.in to
ease maintenance. Please do not remove non-Windows related stuff
unless strictly necessary. Also, before adding anything here
- consider whether src/s/ms-w32.h would be a better place; this is
+ consider whether inc/ms-w32.h would be a better place; this is
particularly true for gcc vs. MSVC conditional defines, MinGW or
MSVC specific code, and macros not already defined in config.in. */
@@ -1538,7 +1538,7 @@
/* Some platforms that do not use configure define this to include extra
configuration information. */
-#define config_opsysfile "s/ms-w32.h"
+#define config_opsysfile <ms-w32.h>
/* A replacement for va_copy, if needed. */
#define gl_va_copy(a,b) ((a) = (b))
=== renamed file 'src/s/ms-w32.h' => 'nt/inc/ms-w32.h'
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-02 04:14:48 +0000
+++ b/src/ChangeLog 2012-08-02 06:19:48 +0000
@@ -1,3 +1,9 @@
+2012-08-02 Glenn Morris <address@hidden>
+
+ * s/ms-w32.h: Move to ../nt/inc.
+ * makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H):
+ Update for new ms-w32.h location.
+
2012-08-02 Paul Eggert <address@hidden>
Port to Solaris 8.
=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in 2012-08-01 00:29:59 +0000
+++ b/src/makefile.w32-in 2012-08-02 06:19:48 +0000
@@ -339,7 +339,7 @@
##
## This works only with GNU Make.
-TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/s/ms-w32.h
+TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/../nt/inc/ms-w32.h
$(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
@@ -353,7 +353,7 @@
$(OBJ1_c)
../lib-src/$(BLD)/etags.exe -a address@hidden/nt/emacs-src.tags \
$(OBJ2_c) \
- $(CURDIR)/*.h $(CURDIR)/s/ms-w32.h
+ $(CURDIR)/*.h $(CURDIR)/../nt/inc/ms-w32.h
TAGS-nmake:
echo This target is not supported with NMake
@@ -403,7 +403,7 @@
$(GNU_LIB)/verify.h
CODING_H = $(SRC)/coding.h \
$(SRC)/composite.h
-MS_W32_H = $(SRC)/s/ms-w32.h \
+MS_W32_H = $(NT_INC)/ms-w32.h \
$(NT_INC)/sys/stat.h
CONF_POST_H = $(SRC)/conf_post.h \
$(MS_W32_H)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109389: Move NT-specific include file to the NT include directory,
Glenn Morris <=