usa	2010-04-05 13:26:33 +0900 (Mon, 05 Apr 2010)

  New Revision: 27222

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

  Log:
    * include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already
      defined EWOULDBLOCK.  based on a patch from Charlie Savage,
      see [ruby-core:29255]

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/win32.h
    trunk/win32/win32.c

Index: include/ruby/win32.h
===================================================================
--- include/ruby/win32.h	(revision 27221)
+++ include/ruby/win32.h	(revision 27222)
@@ -401,7 +401,9 @@
 /* #undef va_end */
 
 /* winsock error map */
+#ifndef EWOULDBLOCK	/* VC10 has this */
 #define EWOULDBLOCK	WSAEWOULDBLOCK
+#endif
 #define EINPROGRESS	WSAEINPROGRESS
 #define EALREADY	WSAEALREADY
 #define ENOTSOCK	WSAENOTSOCK
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27221)
+++ ChangeLog	(revision 27222)
@@ -1,3 +1,9 @@
+Mon Apr  5 13:20:45 2010  NAKAMURA Usaku  <usa@r...>
+
+	* include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already
+	  defined EWOULDBLOCK.  based on a patch from Charlie Savage,
+	  see [ruby-core:29255]
+
 Mon Apr  5 13:10:35 2010  NARUSE, Yui  <naruse@r...>
 
 	* ext/psych/lib/psych/core_ext.rb: remove before alias.
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 27221)
+++ win32/win32.c	(revision 27222)
@@ -161,7 +161,7 @@
     {	ERROR_PIPE_NOT_CONNECTED,	EPIPE		},
     {	ERROR_OPERATION_ABORTED,	EINTR		},
     {	ERROR_NOT_ENOUGH_QUOTA,		ENOMEM		},
-    {	ERROR_MOD_NOT_FOUND,		ENOENT          },
+    {	ERROR_MOD_NOT_FOUND,		ENOENT		},
     {	WSAENAMETOOLONG,		ENAMETOOLONG	},
     {	WSAENOTEMPTY,			ENOTEMPTY	},
     {	WSAEINTR,			EINTR		},
@@ -170,6 +170,7 @@
     {	WSAEFAULT,			EFAULT		},
     {	WSAEINVAL,			EINVAL		},
     {	WSAEMFILE,			EMFILE		},
+    {	WSAEWOULDBLOCK,			EWOULDBLOCK	},
 };
 
 int

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