firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

Fixed #8247: FB_ALIGNMENT is wrongly set to 1 if the test code from configure.ac fails to compile; use special macro for that check

Browse Source
This commit is contained in:
AlexPeshkoff 2024-09-11 09:29:21 +03:00
parent ba59f39b6e
commit bfbca30d43
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.ac
View File

@ -1268,28 +1268,15 @@ AC_CHECK_MEMBER([struct dirent.d_type],
dnl EKU: try to determine the alignment of long and double dnl EKU: try to determine the alignment of long and double
dnl replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h dnl replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
AC_MSG_CHECKING(alignment of long) AC_CHECK_ALIGNOF([union { long long x; void* y; }])
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h> if test "$ac_cv_alignof_union___long_long_x__voidp_y___" = "0"; then
int main () { AC_MSG_ERROR(Failed to detect FB_ALIGNMENT)
struct s { fi
char a; AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_alignof_union___long_long_x__voidp_y___, [Alignment of long])
union { long long x; sem_t y; } b;
};
return (int)&((struct s*)0)->b;
}]])],[ac_cv_c_alignment=$ac_status],[ac_cv_c_alignment=$ac_status],[])
AC_MSG_RESULT($ac_cv_c_alignment)
AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_c_alignment, [Alignment of long])
AC_MSG_CHECKING(alignment of double) dnl AC_MSG_CHECKING(alignment of double)
AC_RUN_IFELSE([AC_LANG_SOURCE([[int main () { AC_CHECK_ALIGNOF(double)
struct s { AC_DEFINE_UNQUOTED(FB_DOUBLE_ALIGN, $ac_cv_alignof_double, [Alignment of double])
char a;
double b;
};
return (int)&((struct s*)0)->b;
}]])],[ac_cv_c_double_align=$ac_status],[ac_cv_c_double_align=$ac_status],[])
AC_MSG_RESULT($ac_cv_c_double_align)
AC_DEFINE_UNQUOTED(FB_DOUBLE_ALIGN, $ac_cv_c_double_align, [Alignment of double])
AC_MSG_CHECKING(correctness of comparing 64-bit integers) AC_MSG_CHECKING(correctness of comparing 64-bit integers)
ac_cv_compare_failed=1 ac_cv_compare_failed=1