[Orxonox-commit 2737] r7442 - in code/branches/ipv6/src/external/enet: . include/enet

[adrfried at orxonox.net]

Author: adrfried
Date: 2010-09-13 13:29:13 +0200 (Mon, 13 Sep 2010)
New Revision: 7442

Modified:
   code/branches/ipv6/src/external/enet/include/enet/win32.h
   code/branches/ipv6/src/external/enet/win32.c
Log:
moved AI_ADDRCONFIG definition to header

Modified: code/branches/ipv6/src/external/enet/include/enet/win32.h
===================================================================
--- code/branches/ipv6/src/external/enet/include/enet/win32.h	2010-09-13 09:08:33 UTC (rev 7441)
+++ code/branches/ipv6/src/external/enet/include/enet/win32.h	2010-09-13 11:29:13 UTC (rev 7442)
@@ -54,6 +54,10 @@
 #define ENET_SOCKETSET_REMOVE(sockset, socket) FD_CLEAR (socket, & (sockset))
 #define ENET_SOCKETSET_CHECK(sockset, socket)  FD_ISSET (socket, & (sockset))
 
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG 0x0400 /* AI_ADDRCONFIG is not defined everywhere */
+#endif
+
 #endif /* __ENET_WIN32_H__ */
 
 

Modified: code/branches/ipv6/src/external/enet/win32.c
===================================================================
--- code/branches/ipv6/src/external/enet/win32.c	2010-09-13 09:08:33 UTC (rev 7441)
+++ code/branches/ipv6/src/external/enet/win32.c	2010-09-13 11:29:13 UTC (rev 7442)
@@ -128,11 +128,7 @@
     struct addrinfo * res;
 
     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;
 
     if ( getaddrinfo(name, NULL, &hints, &result) )