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.

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index ce8f4f9d656592d63b80064aaa9897aaf94f05ec..f24503338cb7595189da7232c158d30c4cfb1da3 100644 (file)
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -141,7 +141,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 74299d1ea5406ab9eb962f3da93adc9b0c270d20..358f9d8229d0e237a448375e93071675f202bcd9 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -252,7 +252,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