r3389 - trunk/libmnetutil/source

[mikma at minisip.org]

Author: mikma
Date: 2007-08-22 22:41:00 +0200 (Wed, 22 Aug 2007)
New Revision: 3389

Modified:
   trunk/libmnetutil/source/LdapUrl.cxx
   trunk/libmnetutil/source/NetworkFunctionsWin32.h
Log:
iphlpapi.h must be included after windows.h
Fix compilation LdapUrl on mingw32, use winldap.h.


Modified: trunk/libmnetutil/source/LdapUrl.cxx
===================================================================
--- trunk/libmnetutil/source/LdapUrl.cxx	2007-08-22 20:29:09 UTC (rev 3388)
+++ trunk/libmnetutil/source/LdapUrl.cxx	2007-08-22 20:41:00 UTC (rev 3389)
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <libmutil/stringutils.h>
 
-#ifdef _MSC_VER
+#ifdef WIN32
 #include <windows.h>
 #include <winldap.h>
 #else

Modified: trunk/libmnetutil/source/NetworkFunctionsWin32.h
===================================================================
--- trunk/libmnetutil/source/NetworkFunctionsWin32.h	2007-08-22 20:29:09 UTC (rev 3388)
+++ trunk/libmnetutil/source/NetworkFunctionsWin32.h	2007-08-22 20:41:00 UTC (rev 3389)
@@ -24,14 +24,14 @@
 #define NETWORKFUNCTIONSWIN32_H
 
 #include<libmnetutil/libmnetutil_config.h>
-#ifdef HAVE_IPHLPAPI_H
-# include<iphlpapi.h>
-#endif
 //#ifdef HAVE_WS2TCPIP_H
 //# include<ws2tcpip.h>
 //#endif
 #include<winsock2.h>
 #include<windows.h>
+#ifdef HAVE_IPHLPAPI_H
+# include<iphlpapi.h>
+#endif
 #include<ws2tcpip.h>
 
 extern HINSTANCE hiphlpapi;