Skip to content

Commit d3d2bbf

Browse files
committed
Merge bitcoin/bitcoin#30327: build: Drop redundant sys/sysctl.h header check
c0b5ea5 build: Drop redundant `sys/sysctl.h` header check (Hennadii Stepanov) Pull request description: The `AC_CHECK_HEADERS` macro defines `HAVE_SYS_SYSCTL_H` if the `sys/sysctl.h` header is found. However, in the source code, this header is guarded by `HAVE_SYSCTL` and `HAVE_SYSCTL_ARND` macros, which have their own checks. Since `HAVE_SYS_SYSCTL_H` is not used, we can skip the `AC_CHECK_HEADERS(... sys/sysctl.h ...)` check. ACKs for top commit: laanwj: ACK c0b5ea5 fanquake: ACK c0b5ea5 - we could got the other way, and add nested #defs, but that doesn't seem worthwhile. Tree-SHA512: 73bc4bbfc5c457cd2c38e40f8e57d2a70c06ef661d76d4148d683d262be45b9405b8cda1958ac611c312ca7d9e2f9624cf2cac1b61f1008af0856875c62f0eac
2 parents 0c57a79 + c0b5ea5 commit d3d2bbf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ if test "$TARGET_OS" = "darwin"; then
897897
AX_CHECK_LINK_FLAG([-Wl,-fixup_chains], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-fixup_chains"], [], [$LDFLAG_WERROR])
898898
fi
899899

900-
AC_CHECK_HEADERS([sys/select.h sys/prctl.h sys/sysctl.h vm/vm_param.h sys/vmmeter.h sys/resources.h])
900+
AC_CHECK_HEADERS([sys/select.h sys/prctl.h vm/vm_param.h sys/vmmeter.h sys/resources.h])
901901

902902
AC_CHECK_DECLS([getifaddrs, freeifaddrs],[CHECK_SOCKET],,
903903
[#include <sys/types.h>

0 commit comments

Comments
 (0)