[Emacs-diffs] /srv/bzr/emacs/trunk r112196: Merge from gnulib

[Paul Eggert]

------------------------------------------------------------
revno: 112196
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-30 10:30:06 -0700
message:
  Merge from gnulib
  
  This incorporates:
  2013-03-29 stdalign: port to stricter ISO C11
  This helps to run 'configure' on MS-Windows; see Eli Zaretskii in
  <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00999.html>.
modified:
  ChangeLog
  m4/stdalign.m4

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-30 08:14:31 +0000
+++ b/ChangeLog 2013-03-30 17:30:06 +0000
@@ -1,3 +1,10 @@
+2013-03-30  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2013-03-29 stdalign: port to stricter ISO C11
+       This helps to run 'configure' on MS-Windows; see Eli Zaretskii in
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00999.html>.
+
 2013-03-27  Paul Eggert  <address@hidden>
 
        * configure.ac (HAVE_XKBGETKEYBOARD): Remove.

=== modified file 'm4/stdalign.m4'
--- a/m4/stdalign.m4    2013-01-01 09:11:05 +0000
+++ b/m4/stdalign.m4    2013-03-30 17:30:06 +0000
@@ -33,8 +33,9 @@
             #if \
                 (__GNUC__ || __IBMC__ || __IBMCPP__ \
                  || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER)
-              int alignas (8) alignas_int = 1;
-              char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1];
+              struct alignas_test { char c; char alignas (8) alignas_8; };
+              char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
+                                ? 1 : -1];
             #endif
           ]])],
        [gl_cv_header_working_stdalign_h=yes],