Changeset 3315:b5bb2bb5347b in roaraudio

Timestamp:

02/03/10 14:57:44 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved winsock support out of vio.[ch]

Files:

• include/libroar/libroar.h (modified) (1 diff)
• include/libroar/vio.h (modified) (1 diff)
• include/libroar/vio_winsock.h (added)
• libroar/Makefile (modified) (1 diff)
• libroar/vio.c (modified) (1 diff)
• libroar/vio_winsock.c (added)

include/libroar/libroar.h

@@ -114 +114 @@
 #include "vio_pipe.h"
 #include "vio_socket.h"
+#include "vio_winsock.h"
 #include "vio_proto.h"
 #include "vio_rtp.h"

include/libroar/vio.h

@@ -100 +100 @@
 int     roar_vio_basic_close   (struct roar_vio_calls * vio);
 
-#ifdef ROAR_TARGET_WIN32
-ssize_t roar_vio_winsock_read    (struct roar_vio_calls * vio, void *buf, size_t count);
-ssize_t roar_vio_winsock_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-int     roar_vio_winsock_nonblock(struct roar_vio_calls * vio, int state);
-int     roar_vio_winsock_sync    (struct roar_vio_calls * vio);
-int     roar_vio_winsock_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
-int     roar_vio_winsock_close   (struct roar_vio_calls * vio);
-#endif
-
 // null
 // this is a read and write in one!

libroar/Makefile

@@ -7 +7 @@
 VIO_META=vio.o vio_select.o vio_ops.o vio_string.o
 VIO_BRIDGE=vio_bio.o vio_stdio.o
-VIO=$(VIO_META) $(VIO_BRIDGE) vio_cmd.o vio_magic.o vio_pipe.o vio_socket.o vio_stack.o vio_jumbo.o vio_proto.o vio_dstr.o vio_tantalos.o vio_rtp.o
+VIO=$(VIO_META) $(VIO_BRIDGE) vio_cmd.o vio_magic.o vio_pipe.o vio_socket.o vio_winsock.o vio_stack.o vio_jumbo.o vio_proto.o vio_dstr.o vio_tantalos.o vio_rtp.o
 OBJS=libroar.o config.o debug.o basic.o stream.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o pinentry.o sshaskpass.o $(VIO) stack.o slp.o nnode.o roardl.o
 

libroar/vio.c

@@ -364 +364 @@
 }
 
-#ifdef ROAR_TARGET_WIN32
-ssize_t roar_vio_winsock_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
- return recv(roar_vio_get_fh(vio), buf, count, 0);
-}
-
-ssize_t roar_vio_winsock_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
- return send(roar_vio_get_fh(vio), buf, count, 0);
-}
-
-int     roar_vio_winsock_nonblock(struct roar_vio_calls * vio, int state) {
- return -1;
-}
-int     roar_vio_winsock_sync    (struct roar_vio_calls * vio) {
- return 0;
-}
-int     roar_vio_winsock_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
- return -1;
-}
-int     roar_vio_winsock_close   (struct roar_vio_calls * vio) {
-
- closesocket(roar_vio_get_fh(vio));
-
- return 0;
-}
-#endif
-
-
 // null
 ssize_t roar_vio_null_rw    (struct roar_vio_calls * vio, void *buf, size_t count) {