Remove leftover declarations for assuming int manipulation is atomic

We never assume this since
<https://bugs.freedesktop.org/show_bug.cgi?id=38005> was fixed, because
it isn't true in modern compilers.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97357

diff --git a/README.cmake b/README.cmake
index c3c6a17..55427df 100644 (file)
--- a/README.cmake
+++ b/README.cmake
@@ -123,9 +123,6 @@ DBUS_ENABLE_VERBOSE_MODE:BOOL=ON
 // build XML  documentation (requires xmlto or meinproc4)
 DBUS_ENABLE_XML_DOCS:BOOL=ON
 
-// Some atomic integer implementation present
-DBUS_HAVE_ATOMIC_INT:BOOL=OFF
-
 // install required system libraries
 DBUS_INSTALL_SYSTEM_LIBS:BOOL=OFF
 
@@ -138,9 +135,6 @@ DBUS_SESSION_BUS_CONNECT_ADDRESS:STRING=autolaunch:
 // system bus default address (only useful on Unix)
 DBUS_SYSTEM_BUS_DEFAULT_ADDRESS:STRING=unix:path=/var/run/dbus/system_bus_socket
 
-// Use atomic integer implementation for 486
-DBUS_USE_ATOMIC_INT_486:BOOL=OFF
-
 win32 only:
 // enable win32 debug port for message output
 DBUS_USE_OUTPUT_DEBUG_STRING:BOOL=OFF

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 5bb4240..4dc5653 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -388,9 +388,6 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI)
     endif(UNAME_EXECUTABLE)
 endif(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI)
 
-set (DBUS_HAVE_ATOMIC_INT ${atomic_int} CACHE STRING "Some atomic integer implementation present")
-set (DBUS_USE_ATOMIC_INT_486 ${atomic_int_486} CACHE STRING "Use atomic integer implementation for 486")
-
 if(X11_FOUND)
   option (DBUS_BUILD_X11 "Build with X11 autolaunch support " ON)
 endif(X11_FOUND)

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index c498362..335819e 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -68,13 +68,6 @@
 #cmakedefine HAVE_CONSOLE_OWNER_FILE 1
 #define DBUS_CONSOLE_OWNER_FILE "@DBUS_CONSOLE_OWNER_FILE@"
 
-#cmakedefine DBUS_HAVE_ATOMIC_INT 1
-#cmakedefine DBUS_USE_ATOMIC_INT_486 1
-#if (defined(__i386__) || defined(__x86_64__))
-# define DBUS_HAVE_ATOMIC_INT 1
-# define DBUS_USE_ATOMIC_INT_486 1
-#endif
-
 #cmakedefine DBUS_BUILD_X11 1
 /* For the moment, the cmake build system doesn't have an equivalent of
  * the autoconf build system's --disable-x11-autolaunch */

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 3603093..3387347 100644 (file)
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -286,16 +286,6 @@ struct DBusAtomic
 #endif
 };
 
-/* The value we get from autofoo is in the form of a cpp expression;
- * convert that to a conventional defined/undef switch. (We can't get
- * the conventional defined/undef because of multiarch builds only running
- * ./configure once, on Darwin.) */
-#if DBUS_HAVE_ATOMIC_INT_COND
-#   define DBUS_HAVE_ATOMIC_INT 1
-#else
-#   undef DBUS_HAVE_ATOMIC_INT
-#endif
-
 DBUS_PRIVATE_EXPORT
 dbus_int32_t _dbus_atomic_inc (DBusAtomic *atomic);
 DBUS_PRIVATE_EXPORT