1 files changed, 10 insertions, 13 deletions

diff --git a/src/socket.h b/src/socket.h
index f8c5d8f..70ebc52 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -6,16 +6,15 @@
 #ifndef SOCK_H
 #define SOCK_H
 
-#include <lua.h>
-#include "error.h"
+#include "io.h"
 
 /*=========================================================================*\
 * Platform specific compatibilization
 \*=========================================================================*/
 #ifdef WIN32
-#include "sockwin32.h"
+#include "wsocket.h"
 #else
-#include "sockunix.h"
+#include "usocket.h"
 #endif
 
 /* we are lazy... */
@@ -25,13 +24,13 @@ typedef struct sockaddr SA;
 * Functions bellow implement a comfortable platform independent 
 * interface to sockets
 \*=========================================================================*/
-int sock_open(lua_State *L);
-
+int sock_open(void);
 const char *sock_create(p_sock ps, int domain, int type, int protocol);
 void sock_destroy(p_sock ps);
-void sock_accept(p_sock ps, p_sock pa, SA *addr, size_t *addr_len, int timeout);
-const char *sock_connect(p_sock ps, SA *addr, size_t addr_len); 
-const char *sock_bind(p_sock ps, SA *addr, size_t addr_len); 
+int sock_accept(p_sock ps, p_sock pa, SA *addr, socklen_t *addr_len, 
+        int timeout);
+const char *sock_connect(p_sock ps, SA *addr, socklen_t addr_len); 
+const char *sock_bind(p_sock ps, SA *addr, socklen_t addr_len); 
 void sock_listen(p_sock ps, int backlog);
 
 int sock_send(p_sock ps, const char *data, size_t count, 
@@ -39,9 +38,9 @@ int sock_send(p_sock ps, const char *data, size_t count,
 int sock_recv(p_sock ps, char *data, size_t count, 
         size_t *got, int timeout);
 int sock_sendto(p_sock ps, const char *data, size_t count, 
-        size_t *sent, SA *addr, size_t addr_len, int timeout);
+        size_t *sent, SA *addr, socklen_t addr_len, int timeout);
 int sock_recvfrom(p_sock ps, char *data, size_t count, 
-        size_t *got, SA *addr, size_t *addr_len, int timeout);
+        size_t *got, SA *addr, socklen_t *addr_len, int timeout);
 
 void sock_setnonblocking(p_sock ps);
 void sock_setblocking(p_sock ps);
@@ -52,6 +51,4 @@ const char *sock_createstrerror(void);
 const char *sock_bindstrerror(void);
 const char *sock_connectstrerror(void);
 
-const char *sock_trysetoptions(lua_State *L, p_sock ps);
-
 #endif /* SOCK_H */