From 44d20d61c7babae9fd2ac3c6578208efa631d5a3 Mon Sep 17 00:00:00 2001
From: luislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 12 Jan 2012 18:28:17 +0000
Subject: [PATCH] Do not define _WIN32_WINNT multiple times

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog             | 6 ++++++
 ext/socket/extconf.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ca3361df5f..6685cbdb34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 13 03:28:00 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* ext/socket/extconf.rb (if ipv6): only define _WIN32_WINNT if was not
+	  previously defined. This solve warnings with multiple defines in
+	  command line with GCC 4.6.1
+
 Thu Jan 12 18:44:31 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb: fix r33904 and revert r33905.  initialize global
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 2e308fe1ab..7bfc01c35d 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -56,7 +56,7 @@ end
 
 if ipv6
   if $mingw
-    $CPPFLAGS << " -D_WIN32_WINNT=0x501"
+    $CPPFLAGS << " -D_WIN32_WINNT=0x501" unless $CPPFLAGS.include?("_WIN32_WINNT")
   end
   ipv6lib = nil
   class << (fmt = "unknown")