server: Make fd_poll_event static

Dmitry Timoshkov dmitry at codeweavers.com
Thu Nov 15 01:06:33 CST 2007


Hello,

Changelog:
    server: Make fd_poll_event static.
---
 server/fd.c   |   11 +++++------
 server/file.h |    1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/server/fd.c b/server/fd.c
index dc292cb..db9e6fc 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -487,6 +487,11 @@ static inline void remove_epoll_user( struct fd *fd, int user )
     }
 }
 
+static inline void fd_poll_event( struct fd *fd, int event )
+{
+    fd->fd_ops->poll_event( fd, event );
+}
+
 static inline void main_loop_epoll(void)
 {
     int i, ret, timeout;
@@ -1689,12 +1694,6 @@ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t h
     return (!current || current->process == process);
 }
 
-/* callback for event happening in the main poll() loop */
-void fd_poll_event( struct fd *fd, int event )
-{
-    return fd->fd_ops->poll_event( fd, event );
-}
-
 /* check if events are pending and if yes return which one(s) */
 int check_fd_events( struct fd *fd, int events )
 {
diff --git a/server/file.h b/server/file.h
index d6295d9..5c5282a 100644
--- a/server/file.h
+++ b/server/file.h
@@ -65,7 +65,6 @@ extern int get_unix_fd( struct fd *fd );
 extern int is_same_file_fd( struct fd *fd1, struct fd *fd2 );
 extern int is_fd_removable( struct fd *fd );
 extern int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle );
-extern void fd_poll_event( struct fd *fd, int event );
 extern int check_fd_events( struct fd *fd, int events );
 extern void set_fd_events( struct fd *fd, int events );
 extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, int shared, int wait );
-- 
1.5.3.4






More information about the wine-patches mailing list