diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2019-01-09 17:54:07 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2019-01-09 17:54:07 +0000 |
| commit | 85253791ff8b14005988f79ac25a89e36cf9c567 (patch) | |
| tree | cd5aa9d57057ef2fc6d1c05f498dba26886c4593 /cmake | |
| parent | 20deb4b61ba5ad29938e759c6770cb9a4c86ac1f (diff) | |
| parent | 4573c15ebbf5b62a381c62a58bb833c4e95f2433 (diff) | |
| download | dbus-85253791ff8b14005988f79ac25a89e36cf9c567.tar.gz | |
Merge branch 'rename-dbus-socket-set' into 'master'
Rename structure DBusSocketSet to DBusPollableSet and adjust the corresponding functions/files
See merge request dbus/dbus!81
Reviewed-by: Simon McVittie
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/dbus/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index 960dbdaf..77b6c10a 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -162,8 +162,8 @@ set (DBUS_UTIL_SOURCES ${DBUS_DIR}/dbus-message-factory.c ${DBUS_DIR}/dbus-message-util.c ${DBUS_DIR}/dbus-shell.c - ${DBUS_DIR}/dbus-socket-set.c - ${DBUS_DIR}/dbus-socket-set-poll.c + ${DBUS_DIR}/dbus-pollable-set.c + ${DBUS_DIR}/dbus-pollable-set-poll.c ${DBUS_DIR}/dbus-string-util.c ${DBUS_DIR}/dbus-sysdeps-util.c ) @@ -182,7 +182,7 @@ set (DBUS_UTIL_HEADERS ${DBUS_DIR}/dbus-mainloop.h ${DBUS_DIR}/dbus-message-factory.h ${DBUS_DIR}/dbus-shell.h - ${DBUS_DIR}/dbus-socket-set.h + ${DBUS_DIR}/dbus-pollable-set.h ${DBUS_DIR}/dbus-spawn.h ${DBUS_DIR}/dbus-test.h ${DBUS_DIR}/dbus-test-wrappers.h @@ -237,7 +237,7 @@ endif (WIN32) if(DBUS_HAVE_LINUX_EPOLL) set(DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES} - ${DBUS_DIR}/dbus-socket-set-epoll.c + ${DBUS_DIR}/dbus-pollable-set-epoll.c ) endif() |