Before compiling on Windows.

1 files changed, 29 insertions, 27 deletions

diff --git a/src/socket.h b/src/socket.h
index ad12b1b..a599d8a 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,5 +1,5 @@
-#ifndef SOCK_H
-#define SOCK_H
+#ifndef SOCKET_H
+#define SOCKET_H
 /*=========================================================================*\
 * Socket compatibilization module
 * LuaSocket toolkit
@@ -37,37 +37,39 @@ typedef struct sockaddr SA;
 * Functions bellow implement a comfortable platform independent 
 * interface to sockets
 \*=========================================================================*/
-int sock_open(void);
-int sock_close(void);
-void sock_destroy(p_sock ps);
-void sock_shutdown(p_sock ps, int how); 
-int sock_sendto(p_sock ps, const char *data, size_t count, 
-        size_t *sent, SA *addr, socklen_t addr_len, p_tm tm);
-int sock_recvfrom(p_sock ps, char *data, size_t count, 
-        size_t *got, SA *addr, socklen_t *addr_len, p_tm tm);
+int socket_open(void);
+int socket_close(void);
+void socket_destroy(p_socket ps);
+void socket_shutdown(p_socket ps, int how); 
+int socket_sendto(p_socket ps, const char *data, size_t count, 
+        size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm);
+int socket_recvfrom(p_socket ps, char *data, size_t count, 
+        size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm);
 
-void sock_setnonblocking(p_sock ps);
-void sock_setblocking(p_sock ps);
+void socket_setnonblocking(p_socket ps);
+void socket_setblocking(p_socket ps);
 
-int sock_waitfd(p_sock ps, int sw, p_tm tm);
-int sock_select(int n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_tm tm);
+int socket_waitfd(p_socket ps, int sw, p_timeout tm);
+int socket_select(int n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm);
 
-int sock_connect(p_sock ps, SA *addr, socklen_t addr_len, p_tm tm); 
-int sock_create(p_sock ps, int domain, int type, int protocol);
-int sock_bind(p_sock ps, SA *addr, socklen_t addr_len); 
-int sock_listen(p_sock ps, int backlog);
-int sock_accept(p_sock ps, p_sock pa, SA *addr, socklen_t *addr_len, p_tm tm);
+int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm); 
+int socket_create(p_socket ps, int domain, int type, int protocol);
+int socket_bind(p_socket ps, SA *addr, socklen_t addr_len); 
+int socket_listen(p_socket ps, int backlog);
+int socket_accept(p_socket ps, p_socket pa, SA *addr, 
+        socklen_t *addr_len, p_timeout tm);
 
-const char *sock_hoststrerror(int err);
-const char *sock_strerror(int err);
+const char *socket_hoststrerror(int err);
+const char *socket_strerror(int err);
 
 /* these are perfect to use with the io abstraction module 
    and the buffered input module */
-int sock_send(p_sock ps, const char *data, size_t count, size_t *sent, p_tm tm);
-int sock_recv(p_sock ps, char *data, size_t count, size_t *got, p_tm tm);
-const char *sock_ioerror(p_sock ps, int err);
+int socket_send(p_socket ps, const char *data, size_t count, 
+        size_t *sent, p_timeout tm);
+int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
+const char *socket_ioerror(p_socket ps, int err);
 
-int sock_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp);
-int sock_gethostbyname(const char *addr, struct hostent **hp);
+int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp);
+int socket_gethostbyname(const char *addr, struct hostent **hp);
 
-#endif /* SOCK_H */
+#endif /* SOCKET_H */