Use src/lib/w32/w32sockets.c for client

[empserver] / src / client / sysdep_w32.h

diff --git a/src/client/sysdep_w32.h b/src/client/sysdep_w32.h
index b5f2f719e52b1d76eb9cd84b2065ff1fbac02648..890690262f2495038fcf3a962257577efcf1177a 100644 (file)
--- a/src/client/sysdep_w32.h
+++ b/src/client/sysdep_w32.h
@@ -29,66 +29,22 @@
  *
  *  Known contributors to this file:
  *     Ron Koenderink, 2007
+ *     Markus Armbruster, 2009
  */
 
 #ifndef _SYSDEF_W32_H
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-#include <signal.h>
-
-extern int getopt(int, char * const[], const char *);
-extern char *optarg;
-extern int optind, opterr, optopt;
-
-#ifdef _MSC_VER
-typedef int __w64 ssize_t;
-#endif
+#include <stdio.h>
 
 struct passwd {
     char *pw_name;
 };
 
-struct iovec {
-    void *iov_base;
-    size_t iov_len;
-};
-
-struct sigaction {
-    int sa_flags;
-    void (*sa_handler)(int sig);
-};
-
-extern int w32_recv(int socket, char *buffer,
-                          size_t buf_size, int flags);
-extern int w32_send(int socket, char *buffer,
-                           size_t buf_size, int flags);
-extern int w32_close_socket(int fd);
-extern int w32_socket(int family, int sock_type, int protocol);
-extern int w32_connect(int sock, struct sockaddr *addr, int addrlen);
-extern int w32_close_handle(int fd);
-extern ssize_t w32_readv_handle(int fd, const struct iovec *iov,
-                               int iovcnt);
-extern ssize_t w32_writev_socket(int fd, const struct iovec *iov,
-                                int iovcnt);
-extern int w32_openfd(const char *fname, int oflag, ...);
-extern int w32_openhandle(const char *fname, int oflag);
-
 extern struct passwd *w32_getpw(void);
-extern char *getpass(char *prompt);
-extern void sysdep_init(void);
-
-#define recv(sock, buffer, buf_size, flags) \
-    w32_recv((sock), (buffer), (buf_size), (flags))
-#define socket(family, sock_type, protocol) \
-    w32_socket((family), (sock_type), (protocol))
-#define connect(sock, addr, addrlen) \
-    w32_connect((sock), (addr), (addrlen))
+extern void w32_sysdep_init(void);
 
+#ifdef _MSC_VER
 #define pclose _pclose
 #define popen _popen
 #define snprintf _snprintf
-#define getsose() ((void)0)
-#define putso() ((void)0)
-#define putse() ((void)0)
-#endif /* sysdef_w32.h */
+#endif
+#endif