From 9dc7565bf89f405d2d37e86e3c540c74c8289441 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Tue, 3 Jun 2014 18:41:20 +0200 Subject: [PATCH] - use same type as in struct pollfd --- dbus/DBusMainLoop.cc | 2 +- dbus/DBusMainLoop.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbus/DBusMainLoop.cc b/dbus/DBusMainLoop.cc index cd63d259..08c0eb49 100644 --- a/dbus/DBusMainLoop.cc +++ b/dbus/DBusMainLoop.cc @@ -202,7 +202,7 @@ namespace DBus vector::iterator - MainLoop::find_enabled_watch(int fd, int events) + MainLoop::find_enabled_watch(int fd, short events) { for (vector::iterator it = watches.begin(); it != watches.end(); ++it) if (it->enabled && it->fd == fd && it->events == events) diff --git a/dbus/DBusMainLoop.h b/dbus/DBusMainLoop.h index 5ce66f08..d170de58 100644 --- a/dbus/DBusMainLoop.h +++ b/dbus/DBusMainLoop.h @@ -62,7 +62,7 @@ namespace DBus DBusWatch* dbus_watch; bool enabled; int fd; - int events; + short events; }; struct Timeout @@ -79,7 +79,7 @@ namespace DBus int wakeup_pipe[2]; vector::iterator find_watch(DBusWatch* dbus_watch); - vector::iterator find_enabled_watch(int fd, int events); + vector::iterator find_enabled_watch(int fd, short events); vector::iterator find_timeout(DBusTimeout* dbus_timeout); static dbus_bool_t add_watch(DBusWatch* dbus_watch, void* data); -- 2.47.3