Use functions from socket.c in socketstream.c

Makes the socket includes and platform specific defines centralized in one
place.

1 files changed, 4 insertions, 12 deletions

diff --git a/src/socketstream.c b/src/socketstream.c
index 73da239..cf7206d 100644
--- a/src/socketstream.c
+++ b/src/socketstream.c
@@ -1,22 +1,14 @@
 #include "socketstream.h"
+#include "socket.h"
 
 #include <assert.h>
 #include <string.h>
 
-#if !defined(_WIN32)
-#include <arpa/inet.h>
-#else
-#include "win32.h"
-#endif
-
-/* close */
-#include <unistd.h>
-
 static int SocketStreamClose(Stream *base)
 {
     int rv;
     SocketStream *stream = (SocketStream *) base;
-    rv = close(stream->sock);
+    rv = SocketDisconnect(stream->sock);
     stream->sock = -1;
     return rv;
 }
@@ -30,7 +22,7 @@ static int64_t SocketStreamRead(void *ptr, size_t size, Stream *stream)
     while (received < size)
     {
         char *p = ((char *) ptr) + received;
-        ssize_t rv = recv(ss->sock, p, size - received, 0);
+        int64_t rv = SocketRecv(ss->sock, p, size - received, 0);
         /* Error */
         if (rv == -1)
             return -1;
@@ -51,7 +43,7 @@ static int64_t SocketStreamWrite(const void *ptr, size_t size, Stream *stream)
     while (written < size)
     {
         const char *p = ((char *) ptr) + written;
-        ssize_t rv = send(ss->sock, p, size - written, 0);
+        int64_t rv = SocketSend(ss->sock, p, size - written, 0);
         if (rv == -1)
             return -1;
         written += (size_t) rv;