[crisscross commit] r861 - trunk/source

[codesite...@google.com]

Author: steven.noonan
Date: Wed Oct 15 16:30:55 2008
New Revision: 861

Modified:
trunk/source/error.cpp

Log:
Tempfix for Windows.

Modified: trunk/source/error.cpp
==============================================================================
--- trunk/source/error.cpp (original)
+++ trunk/source/error.cpp Wed Oct 15 16:30:55 2008
@@ -28,17 +28,16 @@
#if defined (TARGET_OS_WINDOWS)
const struct tl errmap [] =
{
- {WSANO_DATA, "WSANO_DATA", CC_ERR_NO_DATA},
+ /*{WSANO_DATA, "WSANO_DATA", CC_ERR_NO_DATA},
{WSAHOST_NOT_FOUND, "WSAHOST_NOT_FOUND", CC_ERR_HOST_NOT_FOUND},
{WSANO_RECOVERY, "WSANO_RECOVERY", CC_ERR_NO_RECOVERY},
{WSATRY_AGAIN, "WSATRY_AGAIN", CC_ERR_TRY_AGAIN},
- {WSAEINTR, "WSAEINTR", CC_ERR_EINTR},
- {WSAEINTR, "WSAEINTR", CC_ERR_EINTR},
- {WSAEWOULDBLOCK, "WSAEWOULDBLOCK", CC_ERR_EWOULDBLOCK},
- {WSAEINPROGRESS, "WSAEINPROGRESS", CC_ERR_EINPROGRESS},
- {WSAEALREADY, "WSAEALREADY", CC_ERR_EALREADY},
- {WSAENOTSOCK, "WSAENOTSOCK", CC_ERR_ENOTSOCK},
- {WSAEDESTADDRREQ, "WSAEDESTADDRREQ", CC_ERR_EDESTADDRREQ},
+ {WSAEINTR, "WSAEINTR", CC_ERR_EINTR},*/
+ {WSAEWOULDBLOCK, "WSAEWOULDBLOCK", CC_ERR_WOULD_BLOCK},
+ {WSAEINPROGRESS, "WSAEINPROGRESS", CC_ERR_WOULD_BLOCK},
+ //{WSAEALREADY, "WSAEALREADY", CC_ERR_EALREADY},
+ {WSAENOTSOCK, "WSAENOTSOCK", CC_ERR_NOT_SOCKET},
+ /*{WSAEDESTADDRREQ, "WSAEDESTADDRREQ", CC_ERR_EDESTADDRREQ},
{WSAEMSGSIZE, "WSAEMSGSIZE", CC_ERR_EMSGSIZE},
{WSAEPROTOTYPE, "WSAEPROTOTYPE", CC_ERR_EPROTOTYPE},
{WSAENOPROTOOPT, "WSAENOPROTOOPT", CC_ERR_ENOPROTOOPT},
@@ -71,10 +70,9 @@
{WSAESTALE, "WSAESTALE", CC_ERR_ESTALE},
{WSAEREMOTE, "WSAEREMOTE", CC_ERR_EREMOTE},
{WSAEINVAL, "WSAEINVAL", CC_ERR_EINVAL},
- {WSAEFAULT, "WSAEFAULT", CC_ERR_EFAULT},
+ {WSAEFAULT, "WSAEFAULT", CC_ERR_EFAULT},*/
{0, "NOERROR", CC_ERR_NONE},
- {0, "UNKNOWN_ERROR", CC_ERR_INTERNAL},
- {0, NULL, CC_ERR_NONE}
+ {0, "UNKNOWN_ERROR", CC_ERR_INTERNAL}
};
#else
const struct tl errmap [] =
@@ -116,8 +114,8 @@
{EINVAL, "EINVAL", CC_ERR_EINVAL},
{EFAULT, "EFAULT", CC_ERR_EFAULT},
*/
- {0, "UNKNOWN_ERROR", CC_ERR_INTERNAL},
- {0, "NO_ERROR", CC_ERR_NONE}
+ {0, "NO_ERROR", CC_ERR_NONE},
+ {0, "UNKNOWN_ERROR", CC_ERR_INTERNAL}
};
#endif