diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2012-08-01 02:29:59 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2012-08-01 02:29:59 +0200 |
| commit | 552a99b4cb5474337048053c2e7f0dd9eef9b1cb (patch) | |
| tree | 8cc3f2a0fa2c784bfae8c72694ad0511b1a80a9f /lib-src | |
| parent | 0d49da68b9cdc70a1f3ced0cae0b480ace5e28fc (diff) | |
| download | emacs-552a99b4cb5474337048053c2e7f0dd9eef9b1cb.tar.gz | |
Adapt Windows port to recent changes in autogen/config.in.
* lib-src/makefile.w32-in (CONFIG_H): Update dependencies.
(CONF_POST_H): New macro.
* lib/makefile.w32-in (CONFIG_H): Update dependencies.
(CONF_POST_H): New macro.
* nt/config.nt: Sync with autogen/config.in.
Remove code moved to conf_post.h and include <conf_post.h>
(NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME)
(USG5_4, WRETCODE, _longjmp, _setjmp, wait3): New macros.
* src/makefile.w32-in (CONFIG_H): Update dependencies.
(CONF_POST_H): New macro.
* src/s/ms-w32.h (SEPCHAR, NULL_DEVICE): Remove; moved to nt/config.nt.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 2d2bb06cd6f..c5d6ed6eaf0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2012-08-01 Juanma Barranquero <lekktu@gmail.com> + + * makefile.w32-in (CONFIG_H): Update dependencies. + (CONF_POST_H): New macro. + 2012-07-30 Paul Eggert <eggert@cs.ucla.edu> Update .PHONY listings in makefiles. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 65e2f7cae25..8c9482b9194 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -362,8 +362,10 @@ GNU_LIB = $(EMACS_ROOT)/lib MS_W32_H = $(SRC)/s/ms-w32.h \ $(NT_INC)/sys/stat.h -CONFIG_H = $(SRC)/config.h \ +CONF_POST_H = $(SRC)/conf_post.h \ $(MS_W32_H) +CONFIG_H = $(SRC)/config.h \ + $(CONF_POST_H) INTTYPES_H = $(NT_INC)/inttypes.h \ $(NT_INC)/stdint.h NTLIB_H = $(LIB_SRC)/ntlib.h \ |