diff options
-rw-r--r-- | helper.c | 12 | ||||
-rw-r--r-- | socket.c | 4 | ||||
-rw-r--r-- | win/config.h.in | 2 | ||||
-rw-r--r-- | win32.h | 2 |
4 files changed, 13 insertions, 7 deletions
@@ -143,6 +143,12 @@ helper_client_server (struct options *o) #if P2MP #if P2MP_SERVER +/* + * Get tun/tap/null device type + */ + const int dev = dev_type_enum (o->dev, o->dev_type); + const int topology = o->topology; + /* * * HELPER DIRECTIVE for IPv6 @@ -220,12 +226,6 @@ helper_client_server (struct options *o) * push "route-gateway 10.8.0.1" */ - /* - * Get tun/tap/null device type - */ - const int dev = dev_type_enum (o->dev, o->dev_type); - const int topology = o->topology; - if (o->server_defined) { int netbits = -2; @@ -3156,6 +3156,8 @@ link_socket_write_udp_posix_sendmsg (struct link_socket *sock, * inet_ntop() and inet_pton() wrap-implementations using * WSAAddressToString() and WSAStringToAddress() functions */ + +#ifndef _MSC_VER const char * inet_ntop(int af, const void *src, char *dst, socklen_t size) { @@ -3204,6 +3206,8 @@ inet_pton(int af, const char *src, void *dst) return 0; } +#endif + int socket_recv_queue (struct link_socket *sock, int maxsize) { diff --git a/win/config.h.in b/win/config.h.in index 82344a0..ec447a2 100644 --- a/win/config.h.in +++ b/win/config.h.in @@ -275,7 +275,7 @@ typedef unsigned long in_addr_t; #define inline __inline /* type to use in place of socklen_t if not defined */ -#define socklen_t unsigned int +/*#define socklen_t unsigned int*/ #ifndef __MINGW32__ /* 32-bit unsigned type */ @@ -272,8 +272,10 @@ char *get_win_sys_path (void); /* call self in a subprocess */ void fork_to_self (const char *cmdline); +#ifndef _MSV_VER const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); int inet_pton(int af, const char *src, void *st); +#endif /* Find temporary directory */ const char *win_get_tempdir(); |