From cd9165458ba25a815c01d29ff1ce4ce88b599499 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 14 May 2013 08:24:58 +0000
Subject: iphlpapi is unavailable with older VC

* include/ruby/win32.h, win32/Makefile.sub, win32/win32.c: iphlpapi is
  not available with older Visual C.  works with VC9 or later at least.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 6 +++++-
 win32/win32.c      | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'win32')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 98347509aa..04e48c4f8f 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -227,7 +227,11 @@ EXTLIBS =
 EXTSOLIBS =
 !endif
 !if !defined(LIBS)
-LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib iphlpapi.lib imagehlp.lib shlwapi.lib $(EXTLIBS)
+LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib
+!if $(MSC_VER) >= 1400
+LIBS = $(LIBS) iphlpapi.lib
+!endif
+LIBS = $(LIBS) imagehlp.lib shlwapi.lib $(EXTLIBS)
 !endif
 !if !defined(MISSING)
 MISSING = acosh.obj cbrt.obj crypt.obj erf.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32/win32.obj win32/file.obj setproctitle.obj
diff --git a/win32/win32.c b/win32/win32.c
index 63453c349e..373f776504 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3736,6 +3736,7 @@ socketpair(int af, int type, int protocol, int *sv)
     return 0;
 }
 
+#if !defined(_MSC_VER) || _MSC_VER >= 1400
 /* License: Ruby's */
 static void
 str2guid(const char *str, GUID *guid)
@@ -3879,6 +3880,7 @@ freeifaddrs(struct ifaddrs *ifp)
 	ifp = next;
     }
 }
+#endif
 
 //
 // Networking stubs
-- 
cgit v1.2.3