aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/admin.el5
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/makefile.w32-in8
-rw-r--r--lib/makefile.w32-in24
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/config.nt14
-rw-r--r--nt/inc/stdbool.h16
-rw-r--r--src/ChangeLog5
-rw-r--r--src/makefile.w32-in6
11 files changed, 82 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 20d9e4dbc57..df753d1f005 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
12011-01-31 Eli Zaretskii <eliz@gnu.org>
2
3 * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
4 $(BLD)/time_r.$(O).
5 ($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
6 $(EMACS_ROOT)/src/m/intel386.h.
7 ($(BLD)/strftime.$(O)):
8 ($(BLD)/time_r.$(O)): Define prerequisites.
9
12011-01-31 Paul Eggert <eggert@cs.ucla.edu> 102011-01-31 Paul Eggert <eggert@cs.ucla.edu>
2 11
3 src/emacs.c now gets version number from configure.in 12 src/emacs.c now gets version number from configure.in
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6f2ac5d67d5..f7d60b08e4c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12011-01-31 Eli Zaretskii <eliz@gnu.org>
2
3 * admin.el (set-version): Remove lib-src/makefile.w32-in. Add
4 nt/config.nt.
5
12011-01-31 Paul Eggert <eggert@cs.ucla.edu> 62011-01-31 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 src/emacs.c now gets version number from configure.in 8 src/emacs.c now gets version number from configure.in
diff --git a/admin/admin.el b/admin/admin.el
index 739c769b352..9f87e9b2590 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -73,8 +73,9 @@ Root must be the root of an Emacs source tree."
73 (rx (and ".TH EMACS" (1+ not-newline) 73 (rx (and ".TH EMACS" (1+ not-newline)
74 "GNU Emacs" (1+ space) 74 "GNU Emacs" (1+ space)
75 (submatch (1+ (in "0-9.")))))) 75 (submatch (1+ (in "0-9."))))))
76 (set-version-in-file root "lib-src/makefile.w32-in" version 76 (set-version-in-file root "nt/config.nt" version
77 (rx (and "VERSION" (0+ space) "=" (0+ space) 77 (rx (and bol "#" (0+ blank) "define" (1+ blank)
78 "VERSION" (1+ blank)
78 (submatch (1+ (in "0-9.")))))) 79 (submatch (1+ (in "0-9."))))))
79 (set-version-in-file root "nt/makefile.w32-in" version 80 (set-version-in-file root "nt/makefile.w32-in" version
80 (rx (and "VERSION" (0+ space) "=" (0+ space) 81 (rx (and "VERSION" (0+ space) "=" (0+ space)
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3f7a17e2db6..2f56eb8d87a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
12011-01-31 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (VERSION): Don't define, defined on nt/config.nt.
4 (ECLIENT_CFLAGS): Remove -DVERSION.
5 ($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in.
6
12011-01-31 Paul Eggert <eggert@cs.ucla.edu> 72011-01-31 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 src/emacs.c now gets version number from configure.in 9 src/emacs.c now gets version number from configure.in
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 3685d0e71be..50a29a86042 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -21,8 +21,6 @@ ALL = make-docfile hexl ctags etags movemail ebrowse emacsclient
21 21
22.PHONY: $(ALL) 22.PHONY: $(ALL)
23 23
24VERSION = 24.0.50
25
26LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ 24LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
27 -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \ 25 -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \
28 -I../nt/inc -I../src 26 -I../nt/inc -I../src
@@ -59,7 +57,7 @@ $(BLD)/movemail.exe: $(MOVEMAILOBJS) ../lib/getopt.h
59# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 57# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
60 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(MOVEMAILOBJS) $(WSOCK32) $(LIBS) 58 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(MOVEMAILOBJS) $(WSOCK32) $(LIBS)
61 59
62ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR -DVERSION="\"$(VERSION)\"" 60ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR
63ECLIENTOBJS = $(BLD)/emacsclient.$(O) \ 61ECLIENTOBJS = $(BLD)/emacsclient.$(O) \
64 $(BLD)/ntlib.$(O) \ 62 $(BLD)/ntlib.$(O) \
65 ../lib/$(BLD)/libgnu.$(A) 63 ../lib/$(BLD)/libgnu.$(A)
@@ -77,9 +75,7 @@ $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES)
77# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 75# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
78 $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) 76 $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
79 77
80# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in 78$(BLD)/emacsclient.$(O): emacsclient.c
81# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.
82$(BLD)/emacsclient.$(O): emacsclient.c makefile.w32-in
83 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c 79 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
84 80
85ETAGSOBJ = $(BLD)/etags.$(O) \ 81ETAGSOBJ = $(BLD)/etags.$(O) \
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index cf74288e2cf..cdf44f614b6 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -23,7 +23,11 @@ ALL = gnulib
23LOCAL_FLAGS = -DHAVE_CONFIG_H=1 -I. -I../nt/inc -I../src 23LOCAL_FLAGS = -DHAVE_CONFIG_H=1 -I. -I../nt/inc -I../src
24LIBS = 24LIBS =
25 25
26GNULIBOBJS = $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O) 26GNULIBOBJS = $(BLD)/dtoastr.$(O) \
27 $(BLD)/getopt.$(O) \
28 $(BLD)/getopt1.$(O) \
29 $(BLD)/strftime.$(O) \
30 $(BLD)/time_r.$(O)
27 31
28# 32#
29# Build the library 33# Build the library
@@ -54,6 +58,8 @@ $(BLD)/dtoastr.$(O) : \
54 $(SRC)/ftoastr.c \ 58 $(SRC)/ftoastr.c \
55 $(SRC)/ftoastr.h \ 59 $(SRC)/ftoastr.h \
56 $(SRC)/intprops.h \ 60 $(SRC)/intprops.h \
61 $(EMACS_ROOT)/src/s/ms-w32.h \
62 $(EMACS_ROOT)/src/m/intel386.h \
57 $(EMACS_ROOT)/src/config.h 63 $(EMACS_ROOT)/src/config.h
58 64
59$(BLD)/getopt.$(O) : \ 65$(BLD)/getopt.$(O) : \
@@ -72,10 +78,26 @@ $(BLD)/getopt1.$(O) : \
72 $(EMACS_ROOT)/src/m/intel386.h \ 78 $(EMACS_ROOT)/src/m/intel386.h \
73 $(EMACS_ROOT)/src/config.h 79 $(EMACS_ROOT)/src/config.h
74 80
81$(BLD)/strftime.$(O) : \
82 $(SRC)/strftime.c \
83 $(SRC)/strftime.h \
84 $(EMACS_ROOT)/nt/inc/stdbool.h \
85 $(EMACS_ROOT)/src/s/ms-w32.h \
86 $(EMACS_ROOT)/src/m/intel386.h \
87 $(EMACS_ROOT)/src/config.h
88
89$(BLD)/time_r.$(O) : \
90 $(SRC)/time_r.c \
91 $(EMACS_ROOT)/nt/inc/stdbool.h \
92 $(EMACS_ROOT)/src/s/ms-w32.h \
93 $(EMACS_ROOT)/src/m/intel386.h \
94 $(EMACS_ROOT)/src/config.h
95
75# The following dependencies are for supporting parallel builds, where 96# The following dependencies are for supporting parallel builds, where
76# we must make sure $(BLD) exists before any compilation starts. 97# we must make sure $(BLD) exists before any compilation starts.
77# 98#
78$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD 99$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD
100$(BLD)/strftime.$(O) $(BLD)/time_r.$(O): stamp_BLD
79 101
80# 102#
81# Headers we would preprocess if we could. 103# Headers we would preprocess if we could.
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 355c7e83dab..db73491718f 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12011-01-31 Eli Zaretskii <eliz@gnu.org>
2
3 * inc/stdbool.h: New file.
4
12011-01-29 Eli Zaretskii <eliz@gnu.org> 52011-01-29 Eli Zaretskii <eliz@gnu.org>
2 6
3 * makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake) 7 * makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
diff --git a/nt/config.nt b/nt/config.nt
index 53d89701c69..d612a417f4d 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -305,13 +305,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
305/* Name of package */ 305/* Name of package */
306#define PACKAGE "emacs" 306#define PACKAGE "emacs"
307 307
308/* FIXME: This is defined by the various makefile.w32-in files for
309 now. Revisit if/when VERSION from config.h is used by any
310 Makefile.in files. */
311#if 0
312/* Version number of package */ 308/* Version number of package */
313#define VERSION "24.0.50" 309#define VERSION "24.0.50"
314#endif
315 310
316/* Define to `__inline__' or `__inline' if that's what the C compiler 311/* Define to `__inline__' or `__inline' if that's what the C compiler
317 calls it, or to nothing if 'inline' is not supported under any name. */ 312 calls it, or to nothing if 'inline' is not supported under any name. */
@@ -319,6 +314,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
319#undef inline 314#undef inline
320#endif 315#endif
321 316
317/* Define to the equivalent of the C99 'restrict' keyword, or to
318 nothing if this is not supported. Do not define if restrict is
319 supported directly. */
320#ifdef __GNUC__
321# define restrict __restrict__
322#else
323# define restrict
324#endif
325
322/* Define as a marker that can be attached to declarations that might not 326/* Define as a marker that can be attached to declarations that might not
323 be used. This helps to reduce warnings, such as from 327 be used. This helps to reduce warnings, such as from
324 GCC -Wunused-parameter. */ 328 GCC -Wunused-parameter. */
diff --git a/nt/inc/stdbool.h b/nt/inc/stdbool.h
new file mode 100644
index 00000000000..521291fdd03
--- /dev/null
+++ b/nt/inc/stdbool.h
@@ -0,0 +1,16 @@
1#ifndef _NT_STDBOOL_H_
2#define _NT_STDBOOL_H_
3/*
4 * stdbool.h exists in GCC, but not in MSVC.
5 */
6
7#ifdef __GNUC__
8# include_next <stdbool.h>
9#else
10# define _Bool signed char
11# define bool _Bool
12# define false 0
13# define true 1
14#endif
15
16#endif /* _NT_STDBOOL_H_ */
diff --git a/src/ChangeLog b/src/ChangeLog
index f96fe5eb2f8..072e74b77f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-01-31 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (OBJ2): Remove strftime.$(O).
4 ($(BLD)/strftime.$(O)): Remove prerequisites.
5
12011-01-31 Paul Eggert <eggert@cs.ucla.edu> 62011-01-31 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 src/emacs.c now gets version number from configure.in 8 src/emacs.c now gets version number from configure.in
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ad21419ca7f..4f7bbebf6cb 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -113,7 +113,6 @@ OBJ2 = $(BLD)/sysdep.$(O) \
113 $(BLD)/textprop.$(O) \ 113 $(BLD)/textprop.$(O) \
114 $(BLD)/vm-limit.$(O) \ 114 $(BLD)/vm-limit.$(O) \
115 $(BLD)/region-cache.$(O) \ 115 $(BLD)/region-cache.$(O) \
116 $(BLD)/strftime.$(O) \
117 $(BLD)/bidi.$(O) \ 116 $(BLD)/bidi.$(O) \
118 $(BLD)/charset.$(O) \ 117 $(BLD)/charset.$(O) \
119 $(BLD)/character.$(O) \ 118 $(BLD)/character.$(O) \
@@ -1363,11 +1362,6 @@ $(BLD)/sound.$(O) : \
1363 $(SRC)/systime.h \ 1362 $(SRC)/systime.h \
1364 $(SRC)/w32gui.h 1363 $(SRC)/w32gui.h
1365 1364
1366$(BLD)/strftime.$(O) : \
1367 $(SRC)/strftime.c \
1368 $(CONFIG_H) \
1369 $(EMACS_ROOT)/nt/inc/sys/time.h
1370
1371$(BLD)/syntax.$(O) : \ 1365$(BLD)/syntax.$(O) : \
1372 $(SRC)/syntax.c \ 1366 $(SRC)/syntax.c \
1373 $(CONFIG_H) \ 1367 $(CONFIG_H) \
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-13 06:27:53 +0000