Index: Modules/errnomodule.c
===================================================================
--- Modules/errnomodule.c	(revision 86553)
+++ Modules/errnomodule.c	(working copy)
@@ -92,11 +92,11 @@
 #ifdef ENOCSI
     inscode(d, ds, de, "ENOCSI", ENOCSI, "No CSI structure available");
 #endif
+#ifdef WSAEHOSTUNREACH
+    inscode(d, ds, de, "EHOSTUNREACH", WSAEHOSTUNREACH, "No route to host");
+#else
 #ifdef EHOSTUNREACH
     inscode(d, ds, de, "EHOSTUNREACH", EHOSTUNREACH, "No route to host");
-#else
-#ifdef WSAEHOSTUNREACH
-    inscode(d, ds, de, "EHOSTUNREACH", WSAEHOSTUNREACH, "No route to host");
 #endif
 #endif
 #ifdef ENOMSG
@@ -157,11 +157,11 @@
     inscode(d, ds, de, "ENOTEMPTY", WSAENOTEMPTY, "Directory not empty");
 #endif
 #endif
+#ifdef WSAENOBUFS
+    inscode(d, ds, de, "ENOBUFS", WSAENOBUFS, "No buffer space available");
+#else
 #ifdef ENOBUFS
     inscode(d, ds, de, "ENOBUFS", ENOBUFS, "No buffer space available");
-#else
-#ifdef WSAENOBUFS
-    inscode(d, ds, de, "ENOBUFS", WSAENOBUFS, "No buffer space available");
 #endif
 #endif
 #ifdef EPROTO
@@ -180,11 +180,11 @@
 #ifdef ECHILD
     inscode(d, ds, de, "ECHILD", ECHILD, "No child processes");
 #endif
+#ifdef WSAELOOP
+    inscode(d, ds, de, "ELOOP", WSAELOOP, "Too many symbolic links encountered");
+#else
 #ifdef ELOOP
     inscode(d, ds, de, "ELOOP", ELOOP, "Too many symbolic links encountered");
-#else
-#ifdef WSAELOOP
-    inscode(d, ds, de, "ELOOP", WSAELOOP, "Too many symbolic links encountered");
 #endif
 #endif
 #ifdef EXDEV
@@ -196,18 +196,18 @@
 #ifdef ESRCH
     inscode(d, ds, de, "ESRCH", ESRCH, "No such process");
 #endif
+#ifdef WSAEMSGSIZE
+    inscode(d, ds, de, "EMSGSIZE", WSAEMSGSIZE, "Message too long");
+#else
 #ifdef EMSGSIZE
     inscode(d, ds, de, "EMSGSIZE", EMSGSIZE, "Message too long");
-#else
-#ifdef WSAEMSGSIZE
-    inscode(d, ds, de, "EMSGSIZE", WSAEMSGSIZE, "Message too long");
 #endif
 #endif
+#ifdef WSAEAFNOSUPPORT
+    inscode(d, ds, de, "EAFNOSUPPORT", WSAEAFNOSUPPORT, "Address family not supported by protocol");
+#else
 #ifdef EAFNOSUPPORT
     inscode(d, ds, de, "EAFNOSUPPORT", EAFNOSUPPORT, "Address family not supported by protocol");
-#else
-#ifdef WSAEAFNOSUPPORT
-    inscode(d, ds, de, "EAFNOSUPPORT", WSAEAFNOSUPPORT, "Address family not supported by protocol");
 #endif
 #endif
 #ifdef EBADR
@@ -227,21 +227,21 @@
     inscode(d, ds, de, "EPFNOSUPPORT", WSAEPFNOSUPPORT, "Protocol family not supported");
 #endif
 #endif
+#ifdef WSAENOPROTOOPT
+    inscode(d, ds, de, "ENOPROTOOPT", WSAENOPROTOOPT, "Protocol not available");
+#else
 #ifdef ENOPROTOOPT
     inscode(d, ds, de, "ENOPROTOOPT", ENOPROTOOPT, "Protocol not available");
-#else
-#ifdef WSAENOPROTOOPT
-    inscode(d, ds, de, "ENOPROTOOPT", WSAENOPROTOOPT, "Protocol not available");
 #endif
 #endif
 #ifdef EBUSY
     inscode(d, ds, de, "EBUSY", EBUSY, "Device or resource busy");
 #endif
+#ifdef WSAEWOULDBLOCK
+    inscode(d, ds, de, "EWOULDBLOCK", WSAEWOULDBLOCK, "Operation would block");
+#else
 #ifdef EWOULDBLOCK
     inscode(d, ds, de, "EWOULDBLOCK", EWOULDBLOCK, "Operation would block");
-#else
-#ifdef WSAEWOULDBLOCK
-    inscode(d, ds, de, "EWOULDBLOCK", WSAEWOULDBLOCK, "Operation would block");
 #endif
 #endif
 #ifdef EBADFD
@@ -250,11 +250,11 @@
 #ifdef EDOTDOT
     inscode(d, ds, de, "EDOTDOT", EDOTDOT, "RFS specific error");
 #endif
+#ifdef WSAEISCONN
+    inscode(d, ds, de, "EISCONN", WSAEISCONN, "Transport endpoint is already connected");
+#else
 #ifdef EISCONN
     inscode(d, ds, de, "EISCONN", EISCONN, "Transport endpoint is already connected");
-#else
-#ifdef WSAEISCONN
-    inscode(d, ds, de, "EISCONN", WSAEISCONN, "Transport endpoint is already connected");
 #endif
 #endif
 #ifdef ENOANO
@@ -295,11 +295,11 @@
 #ifdef EUNATCH
     inscode(d, ds, de, "EUNATCH", EUNATCH, "Protocol driver not attached");
 #endif
+#ifdef WSAEPROTOTYPE
+    inscode(d, ds, de, "EPROTOTYPE", WSAEPROTOTYPE, "Protocol wrong type for socket");
+#else
 #ifdef EPROTOTYPE
     inscode(d, ds, de, "EPROTOTYPE", EPROTOTYPE, "Protocol wrong type for socket");
-#else
-#ifdef WSAEPROTOTYPE
-    inscode(d, ds, de, "EPROTOTYPE", WSAEPROTOTYPE, "Protocol wrong type for socket");
 #endif
 #endif
 #ifdef ENOSPC
@@ -308,18 +308,18 @@
 #ifdef ENOEXEC
     inscode(d, ds, de, "ENOEXEC", ENOEXEC, "Exec format error");
 #endif
+#ifdef WSAEALREADY
+    inscode(d, ds, de, "EALREADY", WSAEALREADY, "Operation already in progress");
+#else
 #ifdef EALREADY
     inscode(d, ds, de, "EALREADY", EALREADY, "Operation already in progress");
-#else
-#ifdef WSAEALREADY
-    inscode(d, ds, de, "EALREADY", WSAEALREADY, "Operation already in progress");
 #endif
 #endif
+#ifdef WSAENETDOWN
+    inscode(d, ds, de, "ENETDOWN", WSAENETDOWN, "Network is down");
+#else
 #ifdef ENETDOWN
     inscode(d, ds, de, "ENETDOWN", ENETDOWN, "Network is down");
-#else
-#ifdef WSAENETDOWN
-    inscode(d, ds, de, "ENETDOWN", WSAENETDOWN, "Network is down");
 #endif
 #endif
 #ifdef ENOTNAM
@@ -353,31 +353,31 @@
 #ifdef EXFULL
     inscode(d, ds, de, "EXFULL", EXFULL, "Exchange full");
 #endif
+#ifdef WSAECONNREFUSED
+    inscode(d, ds, de, "ECONNREFUSED", WSAECONNREFUSED, "Connection refused");
+#else
 #ifdef ECONNREFUSED
     inscode(d, ds, de, "ECONNREFUSED", ECONNREFUSED, "Connection refused");
-#else
-#ifdef WSAECONNREFUSED
-    inscode(d, ds, de, "ECONNREFUSED", WSAECONNREFUSED, "Connection refused");
 #endif
 #endif
 #ifdef EISDIR
     inscode(d, ds, de, "EISDIR", EISDIR, "Is a directory");
 #endif
+#ifdef WSAEPROTONOSUPPORT
+    inscode(d, ds, de, "EPROTONOSUPPORT", WSAEPROTONOSUPPORT, "Protocol not supported");
+#else
 #ifdef EPROTONOSUPPORT
     inscode(d, ds, de, "EPROTONOSUPPORT", EPROTONOSUPPORT, "Protocol not supported");
-#else
-#ifdef WSAEPROTONOSUPPORT
-    inscode(d, ds, de, "EPROTONOSUPPORT", WSAEPROTONOSUPPORT, "Protocol not supported");
 #endif
 #endif
 #ifdef EROFS
     inscode(d, ds, de, "EROFS", EROFS, "Read-only file system");
 #endif
+#ifdef WSAEADDRNOTAVAIL
+    inscode(d, ds, de, "EADDRNOTAVAIL", WSAEADDRNOTAVAIL, "Cannot assign requested address");
+#else
 #ifdef EADDRNOTAVAIL
     inscode(d, ds, de, "EADDRNOTAVAIL", EADDRNOTAVAIL, "Cannot assign requested address");
-#else
-#ifdef WSAEADDRNOTAVAIL
-    inscode(d, ds, de, "EADDRNOTAVAIL", WSAEADDRNOTAVAIL, "Cannot assign requested address");
 #endif
 #endif
 #ifdef EIDRM
@@ -410,18 +410,18 @@
 #ifdef ENOLINK
     inscode(d, ds, de, "ENOLINK", ENOLINK, "Link has been severed");
 #endif
+#ifdef WSAENETRESET
+    inscode(d, ds, de, "ENETRESET", WSAENETRESET, "Network dropped connection because of reset");
+#else
 #ifdef ENETRESET
     inscode(d, ds, de, "ENETRESET", ENETRESET, "Network dropped connection because of reset");
-#else
-#ifdef WSAENETRESET
-    inscode(d, ds, de, "ENETRESET", WSAENETRESET, "Network dropped connection because of reset");
 #endif
 #endif
+#ifdef WSAETIMEDOUT
+    inscode(d, ds, de, "ETIMEDOUT", WSAETIMEDOUT, "Connection timed out");
+#else
 #ifdef ETIMEDOUT
     inscode(d, ds, de, "ETIMEDOUT", ETIMEDOUT, "Connection timed out");
-#else
-#ifdef WSAETIMEDOUT
-    inscode(d, ds, de, "ETIMEDOUT", WSAETIMEDOUT, "Connection timed out");
 #endif
 #endif
 #ifdef ENOENT
@@ -462,18 +462,18 @@
 #ifdef EDEADLK
     inscode(d, ds, de, "EDEADLK", EDEADLK, "Resource deadlock would occur");
 #endif
+#ifdef WSAENOTCONN
+    inscode(d, ds, de, "ENOTCONN", WSAENOTCONN, "Transport endpoint is not connected");
+#else
 #ifdef ENOTCONN
     inscode(d, ds, de, "ENOTCONN", ENOTCONN, "Transport endpoint is not connected");
-#else
-#ifdef WSAENOTCONN
-    inscode(d, ds, de, "ENOTCONN", WSAENOTCONN, "Transport endpoint is not connected");
 #endif
 #endif
+#ifdef WSAEDESTADDRREQ
+    inscode(d, ds, de, "EDESTADDRREQ", WSAEDESTADDRREQ, "Destination address required");
+#else
 #ifdef EDESTADDRREQ
     inscode(d, ds, de, "EDESTADDRREQ", EDESTADDRREQ, "Destination address required");
-#else
-#ifdef WSAEDESTADDRREQ
-    inscode(d, ds, de, "EDESTADDRREQ", WSAEDESTADDRREQ, "Destination address required");
 #endif
 #endif
 #ifdef ELIBSCN
@@ -485,18 +485,18 @@
 #ifdef EISNAM
     inscode(d, ds, de, "EISNAM", EISNAM, "Is a named type file");
 #endif
+#ifdef WSAECONNABORTED
+    inscode(d, ds, de, "ECONNABORTED", WSAECONNABORTED, "Software caused connection abort");
+#else
 #ifdef ECONNABORTED
     inscode(d, ds, de, "ECONNABORTED", ECONNABORTED, "Software caused connection abort");
-#else
-#ifdef WSAECONNABORTED
-    inscode(d, ds, de, "ECONNABORTED", WSAECONNABORTED, "Software caused connection abort");
 #endif
 #endif
+#ifdef WSAENETUNREACH
+    inscode(d, ds, de, "ENETUNREACH", WSAENETUNREACH, "Network is unreachable");
+#else
 #ifdef ENETUNREACH
     inscode(d, ds, de, "ENETUNREACH", ENETUNREACH, "Network is unreachable");
-#else
-#ifdef WSAENETUNREACH
-    inscode(d, ds, de, "ENETUNREACH", WSAENETUNREACH, "Network is unreachable");
 #endif
 #endif
 #ifdef ESTALE
@@ -512,11 +512,11 @@
 #ifdef ENOMEM
     inscode(d, ds, de, "ENOMEM", ENOMEM, "Out of memory");
 #endif
+#ifdef WSAENOTSOCK
+    inscode(d, ds, de, "ENOTSOCK", WSAENOTSOCK, "Socket operation on non-socket");
+#else
 #ifdef ENOTSOCK
     inscode(d, ds, de, "ENOTSOCK", ENOTSOCK, "Socket operation on non-socket");
-#else
-#ifdef WSAENOTSOCK
-    inscode(d, ds, de, "ENOTSOCK", WSAENOTSOCK, "Socket operation on non-socket");
 #endif
 #endif
 #ifdef ESTRPIPE
@@ -534,25 +534,25 @@
 #ifdef EL3HLT
     inscode(d, ds, de, "EL3HLT", EL3HLT, "Level 3 halted");
 #endif
+#ifdef WSAECONNRESET
+    inscode(d, ds, de, "ECONNRESET", WSAECONNRESET, "Connection reset by peer");
+#else
 #ifdef ECONNRESET
     inscode(d, ds, de, "ECONNRESET", ECONNRESET, "Connection reset by peer");
-#else
-#ifdef WSAECONNRESET
-    inscode(d, ds, de, "ECONNRESET", WSAECONNRESET, "Connection reset by peer");
 #endif
 #endif
+#ifdef WSAEADDRINUSE
+    inscode(d, ds, de, "EADDRINUSE", WSAEADDRINUSE, "Address already in use");
+#else
 #ifdef EADDRINUSE
     inscode(d, ds, de, "EADDRINUSE", EADDRINUSE, "Address already in use");
-#else
-#ifdef WSAEADDRINUSE
-    inscode(d, ds, de, "EADDRINUSE", WSAEADDRINUSE, "Address already in use");
 #endif
 #endif
+#ifdef WSAEOPNOTSUPP
+    inscode(d, ds, de, "EOPNOTSUPP", WSAEOPNOTSUPP, "Operation not supported on transport endpoint");
+#else
 #ifdef EOPNOTSUPP
     inscode(d, ds, de, "EOPNOTSUPP", EOPNOTSUPP, "Operation not supported on transport endpoint");
-#else
-#ifdef WSAEOPNOTSUPP
-    inscode(d, ds, de, "EOPNOTSUPP", WSAEOPNOTSUPP, "Operation not supported on transport endpoint");
 #endif
 #endif
 #ifdef EREMCHG
@@ -607,11 +607,11 @@
 #ifdef ETXTBSY
     inscode(d, ds, de, "ETXTBSY", ETXTBSY, "Text file busy");
 #endif
+#ifdef WSAEINPROGRESS
+    inscode(d, ds, de, "EINPROGRESS", WSAEINPROGRESS, "Operation now in progress");
+#else
 #ifdef EINPROGRESS
     inscode(d, ds, de, "EINPROGRESS", EINPROGRESS, "Operation now in progress");
-#else
-#ifdef WSAEINPROGRESS
-    inscode(d, ds, de, "EINPROGRESS", WSAEINPROGRESS, "Operation now in progress");
 #endif
 #endif
 #ifdef ENXIO