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

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4db23d045a86487d749b9b525c4433c0dbffabc1..033a909c7522be430954f7cbb2f0aa7f666968a9 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * inc/stdalign.h (_Alignas, alignas): Define.
+
 2012-07-28  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use Gnulib stdalign module (Bug#9772, Bug#9960).

diff --git a/nt/inc/stdalign.h b/nt/inc/stdalign.h
index 2ff7a43096ff89d79ee688f2640a577cf360c3a8..7e349dc31d0a2a94ae7eb67c0d2e808595697008 100644 (file)
--- a/nt/inc/stdalign.h
+++ b/nt/inc/stdalign.h
@@ -13,4 +13,13 @@
 #endif
 #define alignof _Alignof
 
+#if __GNUC__
+# define _Alignas(a) __attribute__ ((__aligned__ (a)))
+#elif 1300 <= _MSC_VER
+# define _Alignas(a) __declspec (align (a))
+#endif
+#ifdef _Alignas
+# define alignas _Alignas
+#endif
+
 #endif /* _NT_STDALIGN_H_ */

diff --git a/src/ChangeLog b/src/ChangeLog
index 45e745de9e985cf27fc47bf9ed9db9d41558b9f4..8f9b7cc808428171cc5beb1c0623037fc24c4684 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h.
+
 2012-07-29  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Cleanup statistics calculation in Fgarbage_collect.

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ada19ccdca3b99075db76e61b2605bf4f23c6def..00b9a21065b87f1f8a6f6f9f620a673fd226b5b0 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -438,6 +438,7 @@ LANGINFO_H     = $(NT_INC)/langinfo.h \
 LISP_H         = $(SRC)/lisp.h \
                 $(SRC)/globals.h \
                 $(GNU_LIB)/intprops.h \
+                $(NT_INC)/stdalign.h \
                 $(INTTYPES_H)
 MD5_H          = $(GNU_LIB)/md5.h \
                 $(NT_INC)/stdint.h