Changeset 7435 for code/branches/ipv6

Timestamp:

Sep 12, 2010, 10:56:19 PM (14 years ago)

Author:

landauf

Message:

build fixes for MinGW

Location:

code/branches/ipv6/src/external/enet

Files:

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

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

@@ -29 +29 @@
     include/enet/win32.h
 
+    win32.c
+
 COMPILATION_BEGIN ENetCompilation.c
     callbacks.c
@@ -38 +40 @@
     protocol.c
     unix.c
-    win32.c
 COMPILATION_END
 )

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

@@ -60 +60 @@
 
 #define ENET_HOST_ANY_INIT { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } }                         /**< specifies the default server host (macro for variable initialization) */
-ENET_API const ENetHostAddress ENET_HOST_ANY;                                              /**< specifies the default server host (global constant variable) */
+static const ENetHostAddress ENET_HOST_ANY = ENET_HOST_ANY_INIT;                           /**< specifies the default server host (global constant variable) */
 #define ENET_IPV4MAPPED_PREFIX_INIT { { 0,0,0,0,0,0,0,0,0,0,0xff,0xff,0,0,0,0 } }          /**< specifies the IPv4-mapped IPv6 prefix (macro for variable initialization) */
-ENET_API const ENetHostAddress ENET_IPV4MAPPED_PREFIX;                                     /**< specifies the IPv4-mapped IPv6 prefix (global constant variable) */
+static const ENetHostAddress ENET_IPV4MAPPED_PREFIX = ENET_IPV4MAPPED_PREFIX_INIT;         /**< specifies the IPv4-mapped IPv6 prefix (global constant variable) */
 #define ENET_HOST_BROADCAST_INIT { { 0,0,0,0,0,0,0,0,0,0,0xff,0xff,0xff,0xff,0xff,0xff } } /**< specifies a IPv4 subnet-wide broadcast (macro for variable initialization) */
-ENET_API const ENetHostAddress ENET_HOST_BROADCAST;                                        /**< specifies a IPv4 subnet-wide broadcast (global constant variable) */
+static const ENetHostAddress ENET_HOST_BROADCAST = ENET_HOST_BROADCAST_INIT;               /**< specifies a IPv4 subnet-wide broadcast (global constant variable) */
 enum {
     ENET_IPV4MAPPED_PREFIX_LEN = 12,                                                       /**< specifies the length of the IPv4-mapped IPv6 prefix */

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

@@ -9 +9 @@
 #include "enet/time.h"
 #include "enet/enet.h"
-
-const ENetHostAddress ENET_HOST_ANY = ENET_HOST_ANY_INIT;
-const ENetHostAddress ENET_IPV4MAPPED_PREFIX = ENET_IPV4MAPPED_PREFIX_INIT;
-const ENetHostAddress ENET_HOST_BROADCAST = ENET_HOST_BROADCAST_INIT;
 
 static size_t commandSizes [ENET_PROTOCOL_COMMAND_COUNT] =

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

@@ -5 +5 @@
 #ifdef WIN32
 
+#define _WIN32_WINNT 0x0501
+
 #include <time.h>
 #define ENET_BUILDING_LIB 1
@@ -127 +129 @@
 
     memset(& hints, 0, sizeof (hints));
+#ifdef AI_ADDRCONFIG
     hints.ai_flags = AI_ADDRCONFIG;
+#else
+    hints.ai_flags = 0x0400; // AI_ADDRCONFIG is defined as 0x0400
+#endif
     hints.ai_family = AF_UNSPEC;