Changeset 7392 for code/branches/ipv6/src

Timestamp:

Sep 9, 2010, 6:00:00 PM (14 years ago)

Author:

adrfried

Message:

fix bugs

Location:

code/branches/ipv6/src/external/enet

Files:

• include/enet/enet.h (modified) (1 diff)
• win32.c (modified) (2 diffs)

code/branches/ipv6/src/external/enet/include/enet/enet.h

@@ -59 +59 @@
 } ENetHostAddress;
 
-extern ENET_API const ENetHostAddress ENET_HOST_ANY;          /**< specifies the default server host */
-extern ENET_API const ENetHostAddress ENET_IPV4MAPPED_PREFIX; /**< specifies the IPv4-mapped IPv6 prefix */
-extern ENET_API const ENetHostAddress ENET_HOST_BROADCAST;    /**< specifies a IPv4 subnet-wide broadcast */
-#define ENET_IPV4MAPPED_PREFIX_LEN 12                /**< specifies the length of the IPv4-mapped IPv6 prefix */
-#define ENET_PORT_ANY 0                              /**< specifies that a port should be automatically chosen */
+ENET_API const ENetHostAddress ENET_HOST_ANY;          /**< specifies the default server host */
+ENET_API const ENetHostAddress ENET_IPV4MAPPED_PREFIX; /**< specifies the IPv4-mapped IPv6 prefix */
+ENET_API const ENetHostAddress ENET_HOST_BROADCAST;    /**< specifies a IPv4 subnet-wide broadcast */
+#define ENET_IPV4MAPPED_PREFIX_LEN 12                  /**< specifies the length of the IPv4-mapped IPv6 prefix */
+#define ENET_PORT_ANY 0                                /**< specifies that a port should be automatically chosen */
 
 /**

code/branches/ipv6/src/external/enet/win32.c

@@ -80 +80 @@
     {
         address -> host = enet_address_map4 ((((SOCKADDR_IN *) sin) -> sin_addr.s_addr));
-        //address -> scopeID = 0;
+        /* address -> scopeID = 0; */
         address -> port = ENET_NET_TO_HOST_16 (((SOCKADDR_IN *) sin) -> sin_port);
         return ENET_IPV4;
@@ -200 +200 @@
 enet_socket_create (ENetSocketType type, ENetAddressFamily family)
 {
-    return socket (PF_INET, type == ENET_SOCKET_TYPE_DATAGRAM ? SOCK_DGRAM : SOCK_STREAM, 0);
+    return socket (enet_af (family), type == ENET_SOCKET_TYPE_DATAGRAM ? SOCK_DGRAM : SOCK_STREAM, 0);
 }