From ef2d6c70daf540926d2d5fd4d50e2942633ec9bd Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Tue, 12 Jul 2022 22:29:39 +0800 Subject: Detect machine/endian.h for macOS --- CMakeLists.txt | 5 +++++ include/compat/endian.h | 3 +++ m4/check-libc.m4 | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03963a5..68a7c2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -291,6 +291,11 @@ if(HAVE_ENDIAN_H) add_definitions(-DHAVE_ENDIAN_H) endif() +check_include_files(machine/endian.h HAVE_MACHINE_ENDIAN_H) +if(HAVE_MACHINE_ENDIAN_H) + add_definitions(-DHAVE_MACHINE_ENDIAN_H) +endif() + check_include_files(err.h HAVE_ERR_H) if(HAVE_ERR_H) add_definitions(-DHAVE_ERR_H) diff --git a/include/compat/endian.h b/include/compat/endian.h index 1ed255e..cd85f5c 100644 --- a/include/compat/endian.h +++ b/include/compat/endian.h @@ -24,6 +24,9 @@ #elif defined(HAVE_ENDIAN_H) #include_next +#elif defined(HAVE_MACHINE_ENDIAN_H) +#include_next + #elif defined(__sun) || defined(_AIX) || defined(__hpux) #include #include diff --git a/m4/check-libc.m4 b/m4/check-libc.m4 index 40df67f..68a4f88 100644 --- a/m4/check-libc.m4 +++ b/m4/check-libc.m4 @@ -1,6 +1,6 @@ AC_DEFUN([CHECK_LIBC_COMPAT], [ # Check for libc headers -AC_CHECK_HEADERS([endian.h err.h readpassphrase.h]) +AC_CHECK_HEADERS([endian.h machine/endian.h err.h readpassphrase.h]) AC_CHECK_HEADERS([netinet/ip.h], [], [], [#include #include -- cgit v1.2.3-55-g6feb