From: Eli Zaretskii Date: Sun, 29 Jul 2012 15:43:09 +0000 (+0300) Subject: MS-Windows followup for 2012-07-28T23:05:32Z!eggert@cs.ucla.edu. X-Git-Tag: emacs-24.2.90~1027 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55a6cca64fe00c54a4c880f404dcb362f555034e;p=emacs.git 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 4db23d045a8..033a909c752 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2012-07-29 Eli Zaretskii + + * inc/stdalign.h (_Alignas, alignas): Define. + 2012-07-28 Paul Eggert Use Gnulib stdalign module (Bug#9772, Bug#9960). diff --git a/nt/inc/stdalign.h b/nt/inc/stdalign.h index 2ff7a43096f..7e349dc31d0 100644 --- 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 45e745de9e9..8f9b7cc8084 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-07-29 Eli Zaretskii + + * makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h. + 2012-07-29 Dmitry Antipov 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 \ 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