From: Andrew Cooper Date: Thu, 3 Mar 2016 08:50:11 +0000 (+0100) Subject: errno: declare aliases using XEN_ERRNO() X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1592 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=03720ea541382a3ca80eaaec2aa11932b03aacaf;p=xen.git errno: declare aliases using XEN_ERRNO() Otherwise a custom XEN_ERRNO definition will not end up creating appropriately namespaced constants for the aliases. Signed-off-by: Andrew Cooper Reviewed-by: Doug Goldstein Acked-by: Jan Beulich --- diff --git a/xen/include/public/errno.h b/xen/include/public/errno.h index c3481a5ef8..dbac396798 100644 --- a/xen/include/public/errno.h +++ b/xen/include/public/errno.h @@ -42,6 +42,7 @@ XEN_ERRNO(ENOEXEC, 8) /* Exec format error */ XEN_ERRNO(EBADF, 9) /* Bad file number */ XEN_ERRNO(ECHILD, 10) /* No child processes */ XEN_ERRNO(EAGAIN, 11) /* Try again */ +XEN_ERRNO(EWOULDBLOCK, 11) /* Operation would block. Aliases EAGAIN */ XEN_ERRNO(ENOMEM, 12) /* Out of memory */ XEN_ERRNO(EACCES, 13) /* Permission denied */ XEN_ERRNO(EFAULT, 14) /* Bad address */ @@ -59,6 +60,7 @@ XEN_ERRNO(EMLINK, 31) /* Too many links */ XEN_ERRNO(EDOM, 33) /* Math argument out of domain of func */ XEN_ERRNO(ERANGE, 34) /* Math result not representable */ XEN_ERRNO(EDEADLK, 35) /* Resource deadlock would occur */ +XEN_ERRNO(EDEADLOCK, 35) /* Resource deadlock would occur. Aliases EDEADLK */ XEN_ERRNO(ENAMETOOLONG, 36) /* File name too long */ XEN_ERRNO(ENOLCK, 37) /* No record locks available */ XEN_ERRNO(ENOTEMPTY, 39) /* Directory not empty */ @@ -92,7 +94,4 @@ XEN_ERRNO(ETIMEDOUT, 110) /* Connection timed out */ }; #endif -#define XEN_EWOULDBLOCK XEN_EAGAIN /* Operation would block */ -#define XEN_EDEADLOCK XEN_EDEADLK /* Resource deadlock would occur */ - #endif /* __XEN_PUBLIC_ERRNO_H__ */