Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F29432164 for ; Tue, 3 May 2011 16:58:45 +0000 (UTC) Received: (qmail 57544 invoked by uid 500); 3 May 2011 16:58:45 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 57414 invoked by uid 500); 3 May 2011 16:58:45 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 57407 invoked by uid 99); 3 May 2011 16:58:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 16:58:45 +0000 X-ASF-Spam-Status: No, hits=-1999.2 required=5.0 tests=ALL_TRUSTED,UPPERCASE_50_75 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 16:58:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4115C2388C48; Tue, 3 May 2011 16:58:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1099124 - /commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h Date: Tue, 03 May 2011 16:58:24 -0000 To: commits@commons.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110503165824.4115C2388C48@eris.apache.org> Author: mturk Date: Tue May 3 16:58:23 2011 New Revision: 1099124 URL: http://svn.apache.org/viewvc?rev=1099124&view=rev Log: Fix win32 errno codes so they match the canon_error description table Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h?rev=1099124&r1=1099123&r2=1099124&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h (original) +++ commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h Tue May 3 16:58:23 2011 @@ -610,188 +610,188 @@ enum { */ #if defined(_WINDOWS) /* Windows ACR CANONICAL ERROR VALUES */ -#define ACR_EPERM (ACR_OS_START_CANONERR + EPERM) +#define ACR_EPERM (ACR_OS_START_CANONERR + 1) /** No such file or directory */ -#define ACR_ENOENT (ACR_OS_START_CANONERR + ENOENT) +#define ACR_ENOENT (ACR_OS_START_CANONERR + 2) /** No such process */ -#define ACR_ESRCH (ACR_OS_START_CANONERR + ESRCH) +#define ACR_ESRCH (ACR_OS_START_CANONERR + 3) /** Interrupted system call */ -#define ACR_EINTR (ACR_OS_START_CANONERR + EINTR) +#define ACR_EINTR (ACR_OS_START_CANONERR + 4) /** Input/output error */ -#define ACR_EIO (ACR_OS_START_CANONERR + EIO) +#define ACR_EIO (ACR_OS_START_CANONERR + 5) /** Device not configured */ -#define ACR_ENXIO (ACR_OS_START_CANONERR + ENXIO) +#define ACR_ENXIO (ACR_OS_START_CANONERR + 6) /** Argument list too long */ -#define ACR_E2BIG (ACR_OS_START_CANONERR + E2BIG) +#define ACR_E2BIG (ACR_OS_START_CANONERR + 7) /** Exec format error */ -#define ACR_ENOEXEC (ACR_OS_START_CANONERR + ENOEXEC) +#define ACR_ENOEXEC (ACR_OS_START_CANONERR + 8) /** Bad file descriptor */ -#define ACR_EBADF (ACR_OS_START_CANONERR + EBADF) +#define ACR_EBADF (ACR_OS_START_CANONERR + 9) /** No child processes */ -#define ACR_ECHILD (ACR_OS_START_CANONERR + ECHILD) +#define ACR_ECHILD (ACR_OS_START_CANONERR + 10) /** Resource deadlock avoided */ -#define ACR_EDEADLK (ACR_OS_START_CANONERR + EDEADLK) +#define ACR_EDEADLK (ACR_OS_START_CANONERR + 11) /** Cannot allocate memory */ -#define ACR_ENOMEM (ACR_OS_START_CANONERR + ENOMEM) +#define ACR_ENOMEM (ACR_OS_START_CANONERR + 12) /** Permission denied */ -#define ACR_EACCES (ACR_OS_START_CANONERR + EACCES) +#define ACR_EACCES (ACR_OS_START_CANONERR + 13) /** Bad address */ -#define ACR_EFAULT (ACR_OS_START_CANONERR + EFAULT) +#define ACR_EFAULT (ACR_OS_START_CANONERR + 14) /** Device busy */ -#define ACR_EBUSY (ACR_OS_START_CANONERR + EBUSY) +#define ACR_EBUSY (ACR_OS_START_CANONERR + 16) /** File exists */ -#define ACR_EEXIST (ACR_OS_START_CANONERR + EEXIST) +#define ACR_EEXIST (ACR_OS_START_CANONERR + 17) /** Cross-device link */ -#define ACR_EXDEV (ACR_OS_START_CANONERR + EXDEV) +#define ACR_EXDEV (ACR_OS_START_CANONERR + 18) /** Operation not supported by device */ -#define ACR_ENODEV (ACR_OS_START_CANONERR + ENODEV) +#define ACR_ENODEV (ACR_OS_START_CANONERR + 19) /** Not a directory */ -#define ACR_ENOTDIR (ACR_OS_START_CANONERR + ENOTDIR) +#define ACR_ENOTDIR (ACR_OS_START_CANONERR + 20) /** Is a directory */ -#define ACR_EISDIR (ACR_OS_START_CANONERR + EISDIR) +#define ACR_EISDIR (ACR_OS_START_CANONERR + 21) /** Invalid argument */ -#define ACR_EINVAL (ACR_OS_START_CANONERR + EINVAL) +#define ACR_EINVAL (ACR_OS_START_CANONERR + 22) /** Too many open files in system */ -#define ACR_ENFILE (ACR_OS_START_CANONERR + ENFILE) +#define ACR_ENFILE (ACR_OS_START_CANONERR + 23) /** Too many open files */ -#define ACR_EMFILE (ACR_OS_START_CANONERR + EMFILE) +#define ACR_EMFILE (ACR_OS_START_CANONERR + 24) /** Inappropriate ioctl for device */ -#define ACR_ENOTTY (ACR_OS_START_CANONERR + ENOTTY) +#define ACR_ENOTTY (ACR_OS_START_CANONERR + 25) /** File name too long */ -#define ACR_ENAMETOOLONG (ACR_OS_START_CANONERR + ENAMETOOLONG) +#define ACR_ENAMETOOLONG (ACR_OS_START_CANONERR + 63) /** File too large */ -#define ACR_EFBIG (ACR_OS_START_CANONERR + EFBIG) +#define ACR_EFBIG (ACR_OS_START_CANONERR + 27) /** No space left on device */ -#define ACR_ENOSPC (ACR_OS_START_CANONERR + ENOSPC) +#define ACR_ENOSPC (ACR_OS_START_CANONERR + 28) /** Illegal seek */ -#define ACR_ESPIPE (ACR_OS_START_CANONERR + ESPIPE) +#define ACR_ESPIPE (ACR_OS_START_CANONERR + 29) /** Read-only file system */ -#define ACR_EROFS (ACR_OS_START_CANONERR + EROFS) +#define ACR_EROFS (ACR_OS_START_CANONERR + 30) /** Too many links */ -#define ACR_EMLINK (ACR_OS_START_CANONERR + EMLINK) +#define ACR_EMLINK (ACR_OS_START_CANONERR + 31) /** Broken pipe */ -#define ACR_EPIPE (ACR_OS_START_CANONERR + EPIPE) +#define ACR_EPIPE (ACR_OS_START_CANONERR + 32) /** Numerical argument out of domain */ -#define ACR_EDOM (ACR_OS_START_CANONERR + EDOM) +#define ACR_EDOM (ACR_OS_START_CANONERR + 33) /** Result too large */ -#define ACR_ERANGE (ACR_OS_START_CANONERR + ERANGE) +#define ACR_ERANGE (ACR_OS_START_CANONERR + 34) /** Resource temporarily unavailable */ -#define ACR_EAGAIN (ACR_OS_START_CANONERR + EAGAIN) +#define ACR_EAGAIN (ACR_OS_START_CANONERR + 35) /** No locks available */ -#define ACR_ENOLCK (ACR_OS_START_CANONERR + ENOLCK) +#define ACR_ENOLCK (ACR_OS_START_CANONERR + 77) /** Function not implemented */ -#define ACR_ENOSYS (ACR_OS_START_CANONERR + ENOSYS) +#define ACR_ENOSYS (ACR_OS_START_CANONERR + 77) /** Illegal byte sequence */ -#define ACR_EILSEQ (ACR_OS_START_CANONERR + EILSEQ) +#define ACR_EILSEQ (ACR_OS_START_CANONERR + 84) /** Conversion overflow */ -#define ACR_EOVERFLOW (ACR_OS_START_CANONERR + 46) +#define ACR_EOVERFLOW (ACR_OS_START_CANONERR + 87) /** Operation canceled */ -#define ACR_ECANCELED (ACR_OS_START_CANONERR + 47) +#define ACR_ECANCELED (ACR_OS_START_CANONERR + 88) /** Identifier removed */ -#define ACR_EIDRM (ACR_OS_START_CANONERR + 48) +#define ACR_EIDRM (ACR_OS_START_CANONERR + 89) /** No message of desired type */ -#define ACR_ENOMSG (ACR_OS_START_CANONERR + 49) +#define ACR_ENOMSG (ACR_OS_START_CANONERR + 90) /** Block device required */ -#define ACR_ENOTBLK (ACR_OS_START_CANONERR + 50) +#define ACR_ENOTBLK (ACR_OS_START_CANONERR + 15) /** Text file busy */ -#define ACR_ETXTBSY (ACR_OS_START_CANONERR + 51) +#define ACR_ETXTBSY (ACR_OS_START_CANONERR + 26) /** Operation would block */ -#define ACR_EWOULDBLOCK (ACR_OS_START_CANONERR + 52) +#define ACR_EWOULDBLOCK (ACR_OS_START_CANONERR + 35) /** Operation now in progress */ -#define ACR_EINPROGRESS (ACR_OS_START_CANONERR + 53) +#define ACR_EINPROGRESS (ACR_OS_START_CANONERR + 36) /** Operation already in progress */ -#define ACR_EALREADY (ACR_OS_START_CANONERR + 54) +#define ACR_EALREADY (ACR_OS_START_CANONERR + 37) /** Socket operation on non-socket */ -#define ACR_ENOTSOCK (ACR_OS_START_CANONERR + 55) +#define ACR_ENOTSOCK (ACR_OS_START_CANONERR + 38) /** Destination address required */ -#define ACR_EDESTADDRREQ (ACR_OS_START_CANONERR + 56) +#define ACR_EDESTADDRREQ (ACR_OS_START_CANONERR + 39) /** Message too long */ -#define ACR_EMSGSIZE (ACR_OS_START_CANONERR + 57) +#define ACR_EMSGSIZE (ACR_OS_START_CANONERR + 40) /** Protocol wrong type for socket */ -#define ACR_EPROTOTYPE (ACR_OS_START_CANONERR + 58) +#define ACR_EPROTOTYPE (ACR_OS_START_CANONERR + 41) /** Protocol not available */ -#define ACR_ENOPROTOOPT (ACR_OS_START_CANONERR + 59) +#define ACR_ENOPROTOOPT (ACR_OS_START_CANONERR + 42) /** Protocol not supported */ -#define ACR_EPROTONOSUPPORT (ACR_OS_START_CANONERR + 60) +#define ACR_EPROTONOSUPPORT (ACR_OS_START_CANONERR + 43) /** Socket type not supported */ -#define ACR_ESOCKTNOSUPPORT (ACR_OS_START_CANONERR + 61) +#define ACR_ESOCKTNOSUPPORT (ACR_OS_START_CANONERR + 44) /** Operation not supported */ -#define ACR_EOPNOTSUPP (ACR_OS_START_CANONERR + 62) +#define ACR_EOPNOTSUPP (ACR_OS_START_CANONERR + 45) /** Protocol family not supported */ -#define ACR_EPFNOSUPPORT (ACR_OS_START_CANONERR + 63) +#define ACR_EPFNOSUPPORT (ACR_OS_START_CANONERR + 46) /** Address family not supported by protocol family */ -#define ACR_EAFNOSUPPORT (ACR_OS_START_CANONERR + 64) +#define ACR_EAFNOSUPPORT (ACR_OS_START_CANONERR + 47) /** Address already in use */ -#define ACR_EADDRINUSE (ACR_OS_START_CANONERR + 65) +#define ACR_EADDRINUSE (ACR_OS_START_CANONERR + 48) /** Can't assign requested address */ -#define ACR_EADDRNOTAVAIL (ACR_OS_START_CANONERR + 66) +#define ACR_EADDRNOTAVAIL (ACR_OS_START_CANONERR + 49) /** Network is down */ -#define ACR_ENETDOWN (ACR_OS_START_CANONERR + 67) +#define ACR_ENETDOWN (ACR_OS_START_CANONERR + 50) /** Network is unreachable */ -#define ACR_ENETUNREACH (ACR_OS_START_CANONERR + 68) +#define ACR_ENETUNREACH (ACR_OS_START_CANONERR + 51) /** Network dropped connection on reset */ -#define ACR_ENETRESET (ACR_OS_START_CANONERR + 69) +#define ACR_ENETRESET (ACR_OS_START_CANONERR + 52) /** Software caused connection abort */ -#define ACR_ECONNABORTED (ACR_OS_START_CANONERR + 70) +#define ACR_ECONNABORTED (ACR_OS_START_CANONERR + 53) /** Connection reset by peer */ -#define ACR_ECONNRESET (ACR_OS_START_CANONERR + 71) +#define ACR_ECONNRESET (ACR_OS_START_CANONERR + 54) /** No buffer space available */ -#define ACR_ENOBUFS (ACR_OS_START_CANONERR + 72) +#define ACR_ENOBUFS (ACR_OS_START_CANONERR + 55) /** Socket is already connected */ -#define ACR_EISCONN (ACR_OS_START_CANONERR + 73) +#define ACR_EISCONN (ACR_OS_START_CANONERR + 56) /** Socket is not connected */ -#define ACR_ENOTCONN (ACR_OS_START_CANONERR + 74) +#define ACR_ENOTCONN (ACR_OS_START_CANONERR + 57) /** Can't send after socket shutdown */ -#define ACR_ESHUTDOWN (ACR_OS_START_CANONERR + 75) +#define ACR_ESHUTDOWN (ACR_OS_START_CANONERR + 58) /** Too many references: can't splice */ -#define ACR_ETOOMANYREFS (ACR_OS_START_CANONERR + 76) +#define ACR_ETOOMANYREFS (ACR_OS_START_CANONERR + 59) /** Operation timed out */ -#define ACR_ETIMEDOUT (ACR_OS_START_CANONERR + 77) +#define ACR_ETIMEDOUT (ACR_OS_START_CANONERR + 60) /** Connection refused */ -#define ACR_ECONNREFUSED (ACR_OS_START_CANONERR + 78) +#define ACR_ECONNREFUSED (ACR_OS_START_CANONERR + 61) /** Too many levels of symbolic links */ -#define ACR_ELOOP (ACR_OS_START_CANONERR + 79) +#define ACR_ELOOP (ACR_OS_START_CANONERR + 62) /** Host is down */ -#define ACR_EHOSTDOWN (ACR_OS_START_CANONERR + 80) +#define ACR_EHOSTDOWN (ACR_OS_START_CANONERR + 64) /** No route to host */ -#define ACR_EHOSTUNREACH (ACR_OS_START_CANONERR + 81) +#define ACR_EHOSTUNREACH (ACR_OS_START_CANONERR + 65) /** Directory not empty */ -#define ACR_ENOTEMPTY (ACR_OS_START_CANONERR + 82) +#define ACR_ENOTEMPTY (ACR_OS_START_CANONERR + 66) /** Too many processes */ -#define ACR_EPROCLIM (ACR_OS_START_CANONERR + 83) +#define ACR_EPROCLIM (ACR_OS_START_CANONERR + 67) /** Too many users */ -#define ACR_EUSERS (ACR_OS_START_CANONERR + 84) +#define ACR_EUSERS (ACR_OS_START_CANONERR + 68) /** Disk quota exceeded */ -#define ACR_EDQUOT (ACR_OS_START_CANONERR + 85) +#define ACR_EDQUOT (ACR_OS_START_CANONERR + 69) /** Stale NFS file handle */ -#define ACR_ESTALE (ACR_OS_START_CANONERR + 86) +#define ACR_ESTALE (ACR_OS_START_CANONERR + 70) /** Too many levels of remote in path */ -#define ACR_EREMOTE (ACR_OS_START_CANONERR + 87) +#define ACR_EREMOTE (ACR_OS_START_CANONERR + 71) /** RPC struct is bad */ -#define ACR_EBADRPC (ACR_OS_START_CANONERR + 88) +#define ACR_EBADRPC (ACR_OS_START_CANONERR + 72) /** RPC version wrong */ -#define ACR_ERPCMISMATCH (ACR_OS_START_CANONERR + 89) +#define ACR_ERPCMISMATCH (ACR_OS_START_CANONERR + 73) /** RPC prog. not avail */ -#define ACR_EPROGUNAVAIL (ACR_OS_START_CANONERR + 90) +#define ACR_EPROGUNAVAIL (ACR_OS_START_CANONERR + 74) /** Program version wrong */ -#define ACR_EPROGMISMATCH (ACR_OS_START_CANONERR + 91) +#define ACR_EPROGMISMATCH (ACR_OS_START_CANONERR + 75) /** Bad procedure for program */ -#define ACR_EPROCUNAVAIL (ACR_OS_START_CANONERR + 92) +#define ACR_EPROCUNAVAIL (ACR_OS_START_CANONERR + 76) /** Inappropriate file type or format */ -#define ACR_EFTYPE (ACR_OS_START_CANONERR + 93) +#define ACR_EFTYPE (ACR_OS_START_CANONERR + 79) /** Authentication error */ -#define ACR_EAUTH (ACR_OS_START_CANONERR + 94) +#define ACR_EAUTH (ACR_OS_START_CANONERR + 80) /** Need authenticator */ -#define ACR_ENEEDAUTH (ACR_OS_START_CANONERR + 95) +#define ACR_ENEEDAUTH (ACR_OS_START_CANONERR + 81) /** IPsec processing failure */ -#define ACR_EIPSEC (ACR_OS_START_CANONERR + 96) +#define ACR_EIPSEC (ACR_OS_START_CANONERR + 82) /** Attribute not found */ -#define ACR_ENOATTR (ACR_OS_START_CANONERR + 97) +#define ACR_ENOATTR (ACR_OS_START_CANONERR + 83) /** No medium found */ -#define ACR_ENOMEDIUM (ACR_OS_START_CANONERR + 98) +#define ACR_ENOMEDIUM (ACR_OS_START_CANONERR + 85) /** Wrong Medium Type */ -#define ACR_EMEDIUMTYPE (ACR_OS_START_CANONERR + 99) +#define ACR_EMEDIUMTYPE (ACR_OS_START_CANONERR + 86) #else /* Posix ACR CANONICAL ERROR VALUES */