luislavena	2012-01-13 03:28:17 +0900 (Fri, 13 Jan 2012)

  New Revision: 34284

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34284

  Log:
    Do not define _WIN32_WINNT multiple times

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34283)
+++ ChangeLog	(revision 34284)
@@ -1,3 +1,9 @@
+Fri Jan 13 03:28:00 2012  Luis Lavena  <luislavena@g...>
+
+	* 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@r...>
 
 	* lib/mkmf.rb: fix r33904 and revert r33905.  initialize global
Index: ext/socket/extconf.rb
===================================================================
--- ext/socket/extconf.rb	(revision 34283)
+++ ext/socket/extconf.rb	(revision 34284)
@@ -56,7 +56,7 @@
 
 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")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/