diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-11-25 09:53:34 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-11-25 09:53:34 +0000 |
| commit | 846fa1ca6fc992a70496abc1185538ecb76375d5 (patch) | |
| tree | 71b04e3b327807292ed1feac364793ea90537f6d | |
| parent | 70f1bcef17f77f31f8c60d0fbe07e019202088db (diff) | |
| download | open-axiom-846fa1ca6fc992a70496abc1185538ecb76375d5.tar.gz | |
Check for alignof before __alignof
| -rw-r--r-- | config/open-axiom.m4 | 8 | ||||
| -rwxr-xr-x | configure | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 8d7c3e13..da4dc75c 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -1049,10 +1049,10 @@ dnl or vendor lock-ins such as `__alignof'. AC_DEFUN([OPENAXIOM_ALIGNMENT_OPERATOR],[ AC_MSG_CHECKING([name of alignment query operator]) oa_alignment= -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int a = __alignof(int);]])], - [oa_alignment="__alignof"], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int a = alignof(int);]])], - [oa_alignment="alignof"], +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int a = alignof(int);]])], + [oa_alignment="alignof"], + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int a = __alignof(int);]])], + [oa_alignment="__alignof"], [AC_MSG_ERROR([C++ compiler does not support alignment query operator])])]) AC_DEFINE_UNQUOTED([openaxiom_alignment],[$oa_alignment], [Alignment query operator]) @@ -19928,17 +19928,17 @@ $as_echo_n "checking name of alignment query operator... " >&6; } oa_alignment= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int a = __alignof(int); +int a = alignof(int); _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - oa_alignment="__alignof" + oa_alignment="alignof" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int a = alignof(int); +int a = __alignof(int); _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - oa_alignment="alignof" + oa_alignment="__alignof" else as_fn_error $? "C++ compiler does not support alignment query operator" "$LINENO" 5 fi |