diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-16 17:50:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-16 17:50:14 +0100 |
| commit | 1909a82a8a871781f9a488881944912c7cc367e6 (patch) | |
| tree | b06581f13abfc573246a0a6a2c3d253cbe993151 /cmake | |
| parent | eca7a1c5e0b2fbb4edee3aa3965d2eec451bd66b (diff) | |
| parent | 8874d3a0c57c0cae97cbe426e3686936da53f649 (diff) | |
| download | dbus-1909a82a8a871781f9a488881944912c7cc367e6.tar.gz | |
Merge branch 'dbus-1.8'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 799f3ba3..628a681a 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -411,10 +411,6 @@ endif (WIN32) set (DBUS_USER ) -# In Autotools this has a different default on QNX, but there seems little -# point in replicating that here; if you're on an unusual Unix, use Autotools. -set (DEFAULT_MESSAGE_UNIX_FDS 1024) - # This won't work on Windows. It's not meant to - the system bus is # meaningless on Windows anyway. # diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index bd4cd444..eaec1e98 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -82,8 +82,6 @@ # define DBUS_ENABLE_X11_AUTOLAUNCH 1 #endif -#define DBUS_DEFAULT_MESSAGE_UNIX_FDS @DEFAULT_MESSAGE_UNIX_FDS@ - #define _DBUS_VA_COPY_ASSIGN(a1,a2) { a1 = a2; } #cmakedefine DBUS_VA_COPY_FUNC |