* include/ruby/win32.h: check definition existance before defining

errno macros.

* win32/win32.c (errmap): define winsock errors mappings.
  these are VC++10 support. see [ruby-core:29278]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,11 @@
+Tue Apr  6 14:53:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h: check definition existance before defining
+	  errno macros.
+
+	* win32/win32.c (errmap): define winsock errors mappings.
+	  these are VC++10 support. see [ruby-core:29278]
+
 Tue Apr  6 11:21:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* template/fake.rb.in: hooks for extconf.rb.

include/ruby/win32.h

@@ -401,45 +401,113 @@ extern char *rb_w32_strerror(int);
 /* #undef va_end */
 
 /* winsock error map */
-#ifndef EWOULDBLOCK	/* VC10 has this */
+#ifndef EWOULDBLOCK
 # define EWOULDBLOCK		WSAEWOULDBLOCK
 #endif
+#ifndef EINPROGRESS
 # define EINPROGRESS		WSAEINPROGRESS
+#endif
+#ifndef EALREADY
 # define EALREADY		WSAEALREADY
+#endif
+#ifndef ENOTSOCK
 # define ENOTSOCK		WSAENOTSOCK
+#endif
+#ifndef EDESTADDRREQ
 # define EDESTADDRREQ		WSAEDESTADDRREQ
+#endif
+#ifndef EMSGSIZE
 # define EMSGSIZE		WSAEMSGSIZE
+#endif
+#ifndef EPROTOTYPE
 # define EPROTOTYPE		WSAEPROTOTYPE
+#endif
+#ifndef ENOPROTOOPT
 # define ENOPROTOOPT		WSAENOPROTOOPT
+#endif
+#ifndef EPROTONOSUPPORT
 # define EPROTONOSUPPORT	WSAEPROTONOSUPPORT
+#endif
+#ifndef ESOCKTNOSUPPORT
 # define ESOCKTNOSUPPORT	WSAESOCKTNOSUPPORT
+#endif
+#ifndef EOPNOTSUPP
 # define EOPNOTSUPP		WSAEOPNOTSUPP
+#endif
+#ifndef EPFNOSUPPORT
 # define EPFNOSUPPORT		WSAEPFNOSUPPORT
+#endif
+#ifndef EAFNOSUPPORT
 # define EAFNOSUPPORT		WSAEAFNOSUPPORT
+#endif
+#ifndef EADDRINUSE
 # define EADDRINUSE		WSAEADDRINUSE
+#endif
+#ifndef EADDRNOTAVAIL
 # define EADDRNOTAVAIL		WSAEADDRNOTAVAIL
+#endif
+#ifndef ENETDOWN
 # define ENETDOWN		WSAENETDOWN
+#endif
+#ifndef ENETUNREACH
 # define ENETUNREACH		WSAENETUNREACH
+#endif
+#ifndef ENETRESET
 # define ENETRESET		WSAENETRESET
+#endif
+#ifndef ECONNABORTED
 # define ECONNABORTED		WSAECONNABORTED
+#endif
+#ifndef ECONNRESET
 # define ECONNRESET		WSAECONNRESET
+#endif
+#ifndef ENOBUFS
 # define ENOBUFS		WSAENOBUFS
+#endif
+#ifndef EISCONN
 # define EISCONN		WSAEISCONN
+#endif
+#ifndef ENOTCONN
 # define ENOTCONN		WSAENOTCONN
+#endif
+#ifndef ESHUTDOWN
 # define ESHUTDOWN		WSAESHUTDOWN
+#endif
+#ifndef ETOOMANYREFS
 # define ETOOMANYREFS		WSAETOOMANYREFS
+#endif
+#ifndef ETIMEDOUT
 # define ETIMEDOUT		WSAETIMEDOUT
+#endif
+#ifndef ECONNREFUSED
 # define ECONNREFUSED		WSAECONNREFUSED
+#endif
+#ifndef ELOOP
 # define ELOOP			WSAELOOP
+#endif
 /*#define ENAMETOOLONG	WSAENAMETOOLONG*/
+#ifndef EHOSTDOWN
 # define EHOSTDOWN		WSAEHOSTDOWN
+#endif
+#ifndef EHOSTUNREACH
 # define EHOSTUNREACH		WSAEHOSTUNREACH
+#endif
 /*#define ENOTEMPTY	WSAENOTEMPTY*/
+#ifndef EPROCLIM
 # define EPROCLIM		WSAEPROCLIM
+#endif
+#ifndef EUSERS
 # define EUSERS			WSAEUSERS
+#endif
+#ifndef EDQUOT
 # define EDQUOT			WSAEDQUOT
+#endif
+#ifndef ESTALE
 # define ESTALE			WSAESTALE
+#endif
+#ifndef EREMOTE
 # define EREMOTE		WSAEREMOTE
+#endif
 
 #define F_SETFL 1
 #define O_NONBLOCK 1

win32/win32.c

@@ -162,8 +162,6 @@ static struct {
     {	ERROR_OPERATION_ABORTED,	EINTR		},
     {	ERROR_NOT_ENOUGH_QUOTA,		ENOMEM		},
     {	ERROR_MOD_NOT_FOUND,		ENOENT		},
-    {	WSAENAMETOOLONG,		ENAMETOOLONG	},
-    {	WSAENOTEMPTY,			ENOTEMPTY	},
     {	WSAEINTR,			EINTR		},
     {	WSAEBADF,			EBADF		},
     {	WSAEACCES,			EACCES		},
@@ -171,6 +169,42 @@ static struct {
     {	WSAEINVAL,			EINVAL		},
     {	WSAEMFILE,			EMFILE		},
     {	WSAEWOULDBLOCK,			EWOULDBLOCK	},
+    {	WSAEINPROGRESS,			EINPROGRESS	},
+    {	WSAEALREADY,			EALREADY	},
+    {	WSAENOTSOCK,			ENOTSOCK	},
+    {	WSAEDESTADDRREQ,		EDESTADDRREQ	},
+    {	WSAEMSGSIZE,			EMSGSIZE	},
+    {	WSAEPROTOTYPE,			EPROTOTYPE	},
+    {	WSAENOPROTOOPT,			ENOPROTOOPT	},
+    {	WSAEPROTONOSUPPORT,		EPROTONOSUPPORT	},
+    {	WSAESOCKTNOSUPPORT,		ESOCKTNOSUPPORT	},
+    {	WSAEOPNOTSUPP,			EOPNOTSUPP	},
+    {	WSAEPFNOSUPPORT,		EPFNOSUPPORT	},
+    {	WSAEAFNOSUPPORT,		EAFNOSUPPORT	},
+    {	WSAEADDRINUSE,			EADDRINUSE	},
+    {	WSAEADDRNOTAVAIL,		EADDRNOTAVAIL	},
+    {	WSAENETDOWN,			ENETDOWN	},
+    {	WSAENETUNREACH,			ENETUNREACH	},
+    {	WSAENETRESET,			ENETRESET	},
+    {	WSAECONNABORTED,		ECONNABORTED	},
+    {	WSAECONNRESET,			ECONNRESET	},
+    {	WSAENOBUFS,			ENOBUFS		},
+    {	WSAEISCONN,			EISCONN		},
+    {	WSAENOTCONN,			ENOTCONN	},
+    {	WSAESHUTDOWN,			ESHUTDOWN	},
+    {	WSAETOOMANYREFS,		ETOOMANYREFS	},
+    {	WSAETIMEDOUT,			ETIMEDOUT	},
+    {	WSAECONNREFUSED,		ECONNREFUSED	},
+    {	WSAELOOP,			ELOOP		},
+    {	WSAENAMETOOLONG,		ENAMETOOLONG	},
+    {	WSAEHOSTDOWN,			EHOSTDOWN	},
+    {	WSAEHOSTUNREACH,		EHOSTUNREACH	},
+    {	WSAEPROCLIM,			EPROCLIM	},
+    {	WSAENOTEMPTY,			ENOTEMPTY	},
+    {	WSAEUSERS,			EUSERS		},
+    {	WSAEDQUOT,			EDQUOT		},
+    {	WSAESTALE,			ESTALE		},
+    {	WSAEREMOTE,			EREMOTE		},
 };
 
 int