merge 1.3 r867:868 into trunk and 1.4

This commit is contained in:
tehwan 2011-01-21 00:39:25 +00:00
parent 2a14228b9d
commit 4496f36a80
1 changed files with 1 additions and 1 deletions

View File

@ -89,7 +89,7 @@ XArchEvalWinsock::eval() const throw()
/* 10048 */{WSAEADDRINUSE, "The specified address is already in use"}, /* 10048 */{WSAEADDRINUSE, "The specified address is already in use"},
/* 10049 */{WSAEADDRNOTAVAIL, "The specified address is not available from the local machine"}, /* 10049 */{WSAEADDRNOTAVAIL, "The specified address is not available from the local machine"},
/* 10050 */{WSAENETDOWN, "The Windows Sockets implementation has detected that the network subsystem has failed"}, /* 10050 */{WSAENETDOWN, "The Windows Sockets implementation has detected that the network subsystem has failed"},
/* 10051 */{WSAENETUNREACH, "The network can't be reached from this hos at this time"}, /* 10051 */{WSAENETUNREACH, "The network can't be reached from this host at this time"},
/* 10052 */{WSAENETRESET, "The connection must be reset because the Windows Sockets implementation dropped it"}, /* 10052 */{WSAENETRESET, "The connection must be reset because the Windows Sockets implementation dropped it"},
/* 10053 */{WSAECONNABORTED, "The virtual circuit was aborted due to timeout or other failure"}, /* 10053 */{WSAECONNABORTED, "The virtual circuit was aborted due to timeout or other failure"},
/* 10054 */{WSAECONNRESET, "The virtual circuit was reset by the remote side"}, /* 10054 */{WSAECONNRESET, "The virtual circuit was reset by the remote side"},