[Emacs-diffs] /srv/bzr/emacs/trunk r109262: MS-Windows followup for revision 109252.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109262
fixes bug: http://debbugs.gnu.org/9772
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-29 18:43:09 +0300
message:
  MS-Windows followup for revision 109252.
  
   nt/inc/stdalign.h (_Alignas, alignas): Define.
   src/makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h.
modified:
  nt/ChangeLog
  nt/inc/stdalign.h
  src/ChangeLog
  src/makefile.w32-in

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-07-29 08:18:29 +0000
+++ b/nt/ChangeLog      2012-07-29 15:43:09 +0000
@@ -1,3 +1,7 @@
+2012-07-29  Eli Zaretskii  <address@hidden>
+
+       * inc/stdalign.h (_Alignas, alignas): Define.
+
 2012-07-28  Paul Eggert  <address@hidden>
 
        Use Gnulib stdalign module (Bug#9772, Bug#9960).

=== modified file 'nt/inc/stdalign.h'
--- a/nt/inc/stdalign.h 2012-05-27 12:11:23 +0000
+++ b/nt/inc/stdalign.h 2012-07-29 15:43:09 +0000
@@ -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_ */

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-29 13:51:45 +0000
+++ b/src/ChangeLog     2012-07-29 15:43:09 +0000
@@ -1,3 +1,7 @@
+2012-07-29  Eli Zaretskii  <address@hidden>
+
+       * makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h.
+
 2012-07-29  Dmitry Antipov  <address@hidden>
 
        Cleanup statistics calculation in Fgarbage_collect.

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2012-07-29 08:18:29 +0000
+++ b/src/makefile.w32-in       2012-07-29 15:43:09 +0000
@@ -438,6 +438,7 @@
 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