procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move NT-specific include file to the NT include directory

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2012-08-01 23:19:48 -07:00
parent 2a194dcceb
commit 837b365b2a
11 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-08-02 Glenn Morris <rgm@gnu.org>
* lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
2012-08-02 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib (Bug#12116), incorporating:

4
lib-src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-08-02 Glenn Morris <rgm@gnu.org>
* makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
2012-08-01 Glenn Morris <rgm@gnu.org>
* Makefile.in (config_h): New variable.

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

@ -360,7 +360,7 @@ SRC = $(EMACS_ROOT)/src
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)

4
lib/makefile.w32-in
View file

@ -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 @@ NT_INC = $(EMACS_ROOT)/nt/inc
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)

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2012-08-02 Glenn Morris <rgm@gnu.org>
* emacs-lisp/authors.el (authors-renamed-files-alist): Add ms-w32.h.
2012-08-02 Paul Eggert <eggert@cs.ucla.edu>
Obsolete alias inactivate-current-input-method-function (Bug#10150).

1
lisp/emacs-lisp/authors.el
View file

@ -578,6 +578,7 @@ in the repository.")
("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")

5
nt/ChangeLog
View file

@ -1,3 +1,8 @@
2012-08-02 Glenn Morris <rgm@gnu.org>
* inc/ms-w32.h: Move here from ../src/s.
* config.nt (config_opsysfile): Change to <ms-w32.h>.
2012-08-01 Juanma Barranquero <lekktu@gmail.com>
* config.nt: Sync with autogen/config.in.

4
nt/config.nt
View file

@ -22,7 +22,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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))

0
src/s/ms-w32.h → nt/inc/ms-w32.h
View file

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2012-08-02 Glenn Morris <rgm@gnu.org>
* 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 <eggert@cs.ucla.edu>
Port to Solaris 8.

6
src/makefile.w32-in
View file

@ -339,7 +339,7 @@ cleanall: clean
##
## 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 @@ TAGS-gmake:
$(OBJ1_c)
../lib-src/$(BLD)/etags.exe -a --regex=@../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 @@ CHARSET_H = $(SRC)/charset.h \
$(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)