diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
| commit | fa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch) | |
| tree | 7d0ae09775ea950056193eaa2ca93844299d46f1 /gnulib-m4/stdalign.m4 | |
| parent | c78359d9542c86b972aac373efcf7bc7a8a560e5 (diff) | |
| parent | 2959e59fab3bab834368adefd90bd4b1b094366b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'gnulib-m4/stdalign.m4')
| -rw-r--r-- | gnulib-m4/stdalign.m4 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gnulib-m4/stdalign.m4 b/gnulib-m4/stdalign.m4 index c74fe9b..78577cb 100644 --- a/gnulib-m4/stdalign.m4 +++ b/gnulib-m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for stdalign.h that conforms to C11. -dnl Copyright 2011-2018 Free Software Foundation, Inc. +dnl Copyright 2011-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,8 @@ AC_DEFUN([gl_STDALIGN_H], [gl_cv_header_working_stdalign_h], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[#include <stdalign.h> + [[#include <stdint.h> + #include <stdalign.h> #include <stddef.h> /* Test that alignof yields a result consistent with offsetof. @@ -32,6 +33,7 @@ AC_DEFUN([gl_STDALIGN_H], /* Test _Alignas only on platforms where gnulib can help. */ #if \ ((defined __cplusplus && 201103 <= __cplusplus) \ + || (__TINYC__ && defined __attribute__) \ || (defined __APPLE__ && defined __MACH__ \ ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ : __GNUC__) \ @@ -47,11 +49,8 @@ AC_DEFUN([gl_STDALIGN_H], [gl_cv_header_working_stdalign_h=no])]) if test $gl_cv_header_working_stdalign_h = yes; then - STDALIGN_H='' + GL_GENERATE_STDALIGN_H=false else - STDALIGN_H='stdalign.h' + GL_GENERATE_STDALIGN_H=true fi - - AC_SUBST([STDALIGN_H]) - AM_CONDITIONAL([GL_GENERATE_STDALIGN_H], [test -n "$STDALIGN_H"]) ]) |