aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-07-29 18:43:09 +0300
committerEli Zaretskii2012-07-29 18:43:09 +0300
commit55a6cca64fe00c54a4c880f404dcb362f555034e (patch)
tree2c16fd6016b6ff79b8fcc19af401f6bef06cae0f /src
parentdbcf001cd7877a7f03a9307afbb82190b24bc356 (diff)
downloademacs-55a6cca64fe00c54a4c880f404dcb362f555034e.tar.gz
emacs-55a6cca64fe00c54a4c880f404dcb362f555034e.zip
MS-Windows followup for 2012-07-28T23:05:32Z!eggert@cs.ucla.edu.
nt/inc/stdalign.h (_Alignas, alignas): Define. src/makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h. Fixes: debbugs:9772
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/makefile.w32-in1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 45e745de9e9..8f9b7cc8084 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-07-29 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h.
4
12012-07-29 Dmitry Antipov <dmantipov@yandex.ru> 52012-07-29 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 Cleanup statistics calculation in Fgarbage_collect. 7 Cleanup statistics calculation in Fgarbage_collect.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ada19ccdca3..00b9a21065b 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -438,6 +438,7 @@ LANGINFO_H = $(NT_INC)/langinfo.h \
438LISP_H = $(SRC)/lisp.h \ 438LISP_H = $(SRC)/lisp.h \
439 $(SRC)/globals.h \ 439 $(SRC)/globals.h \
440 $(GNU_LIB)/intprops.h \ 440 $(GNU_LIB)/intprops.h \
441 $(NT_INC)/stdalign.h \
441 $(INTTYPES_H) 442 $(INTTYPES_H)
442MD5_H = $(GNU_LIB)/md5.h \ 443MD5_H = $(GNU_LIB)/md5.h \
443 $(NT_INC)/stdint.h 444 $(NT_INC)/stdint.h