commit 1ab243bac186fcebcbe8b73f2f5d87f7a33e3e86
author Alexandre Julliard <julliard@winehq.org> Tue Dec 19 02:12:45 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Dec 19 02:12:45 2000 +0000
tree 31f188c284b788546bb3d498a165c0486f98cc30
parent d88dbb4a108b9bd9204ba2edf9d9faf7a5af6091

Merged the get_read_fd and get_write_fd requests.

server/serial.c

diff --git a/server/serial.c b/server/serial.c
index c549bec..7d30d4d 100644
--- a/server/serial.c
+++ b/server/serial.c
@@ -37,8 +37,7 @@
 #include "request.h"
 
 static void serial_dump( struct object *obj, int verbose );
-static int serial_get_read_fd( struct object *obj );
-static int serial_get_write_fd( struct object *obj );
+static int serial_get_fd( struct object *obj );
 static int serial_get_info( struct object *obj, struct get_file_info_request *req );
 static int serial_get_poll_events( struct object *obj );
 
@@ -72,8 +71,7 @@
     no_satisfied,                 /* satisfied */
     serial_get_poll_events,       /* get_poll_events */
     default_poll_event,           /* poll_event */
-    serial_get_read_fd,           /* get_read_fd */
-    serial_get_write_fd,          /* get_write_fd */
+    serial_get_fd,                /* get_fd */
     no_flush,                     /* flush */
     serial_get_info,              /* get_file_info */
     no_destroy                    /* destroy */
@@ -152,14 +150,7 @@
     return events;
 }
 
-static int serial_get_read_fd( struct object *obj )
-{
-    struct serial *serial = (struct serial *)obj;
-    assert( obj->ops == &serial_ops );
-    return dup( serial->obj.fd );
-}
-
-static int serial_get_write_fd( struct object *obj )
+static int serial_get_fd( struct object *obj )
 {
     struct serial *serial = (struct serial *)obj;
     assert( obj->ops == &serial_ops );