Changeset 7391

Timestamp:

Sep 9, 2010, 5:02:16 PM (14 years ago)

Author:

rgrieder

Message:

Compile ENet as C library.

Location:

code/branches/ipv6/src/external/enet

Files:

• CMakeLists.txt (modified) (1 diff)
• host.c (modified) (2 diffs)
• include/enet/enet.h (modified) (1 diff)
• protocol.c (modified) (2 diffs)
• win32.c (modified) (3 diffs)

code/branches/ipv6/src/external/enet/CMakeLists.txt

@@ -29 +29 @@
     include/enet/win32.h
 
-COMPILATION_BEGIN ENetCompilation.cpp
+COMPILATION_BEGIN ENetCompilation.c
     callbacks.c
     compress.c

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

@@ -53 +53 @@
     ENetHost * host;
     ENetPeer * currentPeer;
+    int family;
 
     if (peerCount > ENET_PROTOCOL_MAXIMUM_PEER_ID)
@@ -70 +71 @@
     memset (host -> peers, 0, peerCount * sizeof (ENetPeer));
 
-    int family = (address == NULL || !memcmp (& address -> host, & ENET_HOST_ANY, sizeof (ENetHostAddress))) ?
+    family = (address == NULL || !memcmp (& address -> host, & ENET_HOST_ANY, sizeof (ENetHostAddress))) ?
         ENET_IPV4 | ENET_IPV6 :
         enet_get_address_family (address);

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

@@ -59 +59 @@
 } ENetHostAddress;
 
-extern const ENetHostAddress ENET_HOST_ANY;          /**< specifies the default server host */
-extern const ENetHostAddress ENET_IPV4MAPPED_PREFIX; /**< specifies the IPv4-mapped IPv6 prefix */
-extern const ENetHostAddress ENET_HOST_BROADCAST;    /**< specifies a IPv4 subnet-wide broadcast */
+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 */

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

@@ -1398 +1398 @@
          ++ currentPeer)
     {
+        ENetAddressFamily family;
+        ENetSocket socket;
+
         if (currentPeer -> state == ENET_PEER_STATE_DISCONNECTED ||
             currentPeer -> state == ENET_PEER_STATE_ZOMBIE)
@@ -1522 +1525 @@
         currentPeer -> lastSendTime = host -> serviceTime;
 
-        ENetAddressFamily family = enet_get_address_family (& currentPeer -> address);
-        ENetSocket socket = family == ENET_IPV4 ? host -> socket4 : host -> socket6;
+        family = enet_get_address_family (& currentPeer -> address);
+        socket = family == ENET_IPV4 ? host -> socket4 : host -> socket6;
         if (socket == ENET_SOCKET_NULL)
           return -1;

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

@@ -181 +181 @@
     else
     {
-        ENetAddress address_ = { ENET_HOST_ANY, 0, 0 };
+        ENetAddress address_;
+        address_.host = ENET_HOST_ANY;
+        address_.scopeID = 0;
+        address_.port = 0;
         enet_address_set_sin((SOCKADDR *) & sin, & address_, family);
     }
@@ -366 +369 @@
     struct timeval timeVal;
     int selectCount;
+    ENetSocket maxSocket;
 
     timeVal.tv_sec = timeout / 1000;
@@ -389 +393 @@
     }
 
-    ENetSocket maxSocket = 0;
+    maxSocket = 0;
     if (socket4 != ENET_SOCKET_NULL)
         maxSocket = socket4;