Merge "[lib-fix] Fixed return value of kdbus_write_msg Change-Id: Ia3a45a6a79b4078929...

[platform/upstream/dbus.git] / dbus / dbus-socket-set.c

diff --git a/dbus/dbus-socket-set.c b/dbus/dbus-socket-set.c
index ddc4751..210d600 100644 (file)
--- a/dbus/dbus-socket-set.c
+++ b/dbus/dbus-socket-set.c
@@ -31,6 +31,13 @@ _dbus_socket_set_new (int size_hint)
 {
   DBusSocketSet *ret;
 
+#ifdef DBUS_HAVE_LINUX_EPOLL
+  ret = _dbus_socket_set_epoll_new ();
+
+  if (ret != NULL)
+    return ret;
+#endif
+
   ret = _dbus_socket_set_poll_new (size_hint);
 
   if (ret != NULL)