From 9cf3b0810fcec8acd324d1b7a278ac9dc4aed08d Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Sun, 15 May 2022 11:28:51 +0100 Subject: [PATCH] cmake: Fix definition of DBUS_USE_SYNC dbus-sysdeps-unix.c checks for DBUS_USE_SYNC using 0/1 checks not defined checks, so we should be using #cmakedefine01. This fixes lots of -Wundef warnings when compiling for FreeBSD and ensures that we actually use atomics instead of the pthread fallback there. (cherry picked from commit b932c343c4965023b0fd0a16be76840755ff6434) Backported-from: dbus!306 --- cmake/ConfigureChecks.cmake | 2 +- cmake/config.h.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index 45136cc3..baa8ac21 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -137,7 +137,7 @@ CHECK_C_SOURCE_COMPILES(" int main() { int a = 4; int b = __sync_sub_and_fetch(&a, 4); - exit(b); + return b; } " DBUS_USE_SYNC) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 06bb34fd..ed8ef66c 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -246,7 +246,7 @@ #cmakedefine DBUS_HAVE_LINUX_EPOLL 1 /* Use the gcc __sync extension */ -#cmakedefine DBUS_USE_SYNC 1 +#cmakedefine01 DBUS_USE_SYNC #cmakedefine HAVE_VASPRINTF 1 #cmakedefine HAVE_VSNPRINTF 1