Changeset 3933Tweet

Timestamp:

Nov 18, 2009, 2:23:58 PM (11 years ago)

Author:

Sam Hocevar

Message:

Add a VS 2010 solution file and make the code build again for Win32.

Location:

zzuf/trunk

Files:

• msvc/config.h (modified) (1 diff)
• msvc/libzzuf.vcxproj (added)
• msvc/zzuf.vcxproj (added)
• msvc/zzuf10.sln (added)
• src/network.c (modified) (7 diffs)

zzuf/trunk/msvc/config.h

@@ -17 +17 @@
  */
 
-#define VERSION "0.7 (msvc)"
+#define PACKAGE_VERSION "0.7 (msvc)"
 #define SONAME "libzzuf.dll"
+
+#define ATTRIBUTE_PRINTF(x,y)
 
 #define HAVE_WINDOWS_H 1

zzuf/trunk/src/network.c

@@ -27 +27 @@
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#if defined HAVE_SYS_SOCKET_H
+#   include <sys/socket.h>
+#   include <netinet/in.h>
+#   include <arpa/inet.h>
+#endif
 
 #include "libzzuf.h"
@@ -36 +38 @@
 #include "network.h"
 
+#if defined HAVE_SYS_SOCKET_H
 static unsigned int get_socket_ip(int);
 static int host_in_list(unsigned int, unsigned int const *);
@@ -49 +52 @@
 static int *ports = NULL;
 static int static_ports[512];
+#endif
 
 void _zz_network_init(void)
@@ -57 +61 @@
 void _zz_network_fini(void)
 {
+#if defined HAVE_SYS_SOCKET_H
     if(ports != static_ports)
         free(ports);
@@ -63 +68 @@
     if(deny != static_deny)
         free(deny);
+#endif
 }
 
 void _zz_allow(char const *allowlist)
 {
+#if defined HAVE_SYS_SOCKET_H
     allow = create_host_list(allowlist, static_allow);
+#endif
 }
 
 void _zz_deny(char const *denylist)
 {
+#if defined HAVE_SYS_SOCKET_H
     deny = create_host_list(denylist, static_deny);
+#endif
 }
 
 void _zz_ports(char const *portlist)
 {
+#if defined HAVE_SYS_SOCKET_H
     ports = _zz_allocrange(portlist, static_ports);
+#endif
 }
 
 int _zz_portwatched(int port)
 {
+#if defined HAVE_SYS_SOCKET_H
     if(!ports)
         return 1;
 
     return _zz_isinrange(port, ports);
+#else
+    return 0;
+#endif
 }
 
 int _zz_hostwatched(int sock)
 {
+#if defined HAVE_SYS_SOCKET_H
     int watch = 1;
     unsigned int ip;
@@ -104 +121 @@
 
     return watch;
+#else
+    return 0;
+#endif
 }
 
 /* XXX: the following functions are local */
 
+#if defined HAVE_SYS_SOCKET_H
 static unsigned int *create_host_list(char const *list,
                                       unsigned int *static_list)
@@ -193 +214 @@
     return sin.sin_addr.s_addr;
 }
-
+#endif /* HAVE_SYS_SOCKET_H */