diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-08-15 15:24:16 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2016-10-13 17:20:36 +0100 |
| commit | 47f14b8e3b5e676ac8accadf5a7d614b95bf6e1d (patch) | |
| tree | 0a44a5e7e4299ca0a22c905339e51c5391bbc662 /cmake | |
| parent | 91ae697d41185b06e8d3926e100cf10c8685b94c (diff) | |
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
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 5bb4240df..4dc5653f9 100644 --- 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 c4983623c..335819edd 100644 --- 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 */ |