- use same type as in struct pollfd

diff --git a/dbus/DBusMainLoop.cc b/dbus/DBusMainLoop.cc
index cd63d2595c84076a598134aedae2950f29cb2280..08c0eb492a2b6361f4761c6ccafa7c18acffa9a0 100644 (file)
--- a/dbus/DBusMainLoop.cc
+++ b/dbus/DBusMainLoop.cc
@@ -202,7 +202,7 @@ namespace DBus
 
 
     vector<MainLoop::Watch>::iterator
-    MainLoop::find_enabled_watch(int fd, int events)
+    MainLoop::find_enabled_watch(int fd, short events)
     {
        for (vector<Watch>::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 5ce66f0840920a79c2d380086fe2ca5ffec2de3b..d170de58c329fa042bac0d965808df3867578939 100644 (file)
--- 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<Watch>::iterator find_watch(DBusWatch* dbus_watch);
-       vector<Watch>::iterator find_enabled_watch(int fd, int events);
+       vector<Watch>::iterator find_enabled_watch(int fd, short events);
        vector<Timeout>::iterator find_timeout(DBusTimeout* dbus_timeout);
 
        static dbus_bool_t add_watch(DBusWatch* dbus_watch, void* data);