proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-30 05:06:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

caps.h: Rename __errno to ___errno

Browse Source 
At least bionic defines __errno, so this was causing a conflict in caps.h
leading to build failure. Renaming to ___errno avoids that conflicting
definition.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2013-01-03 12:24:18 -05:00
parent 956edc5496
commit c4b790845d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lxc/caps.h
View File

@ -58,28 +58,28 @@ static inline int lxc_caps_last_cap(void) {
#define lxc_priv(__lxc_function) \ #define lxc_priv(__lxc_function) \
({ \ ({ \
__label__ out; \ __label__ out; \
int __ret, __ret2, __errno = 0; \ int __ret, __ret2, ___errno = 0; \
__ret = lxc_caps_up(); \ __ret = lxc_caps_up(); \
if (__ret) \ if (__ret) \
goto out; \ goto out; \
__ret = __lxc_function; \ __ret = __lxc_function; \
if (__ret) \ if (__ret) \
__errno = errno; \ ___errno = errno; \
__ret2 = lxc_caps_down(); \ __ret2 = lxc_caps_down(); \
out: __ret ? errno = __errno,__ret : __ret2; \ out: __ret ? errno = ___errno,__ret : __ret2; \
}) })
#define lxc_unpriv(__lxc_function) \ #define lxc_unpriv(__lxc_function) \
({ \ ({ \
__label__ out; \ __label__ out; \
int __ret, __ret2, __errno = 0; \ int __ret, __ret2, ___errno = 0; \
__ret = lxc_caps_down(); \ __ret = lxc_caps_down(); \
if (__ret) \ if (__ret) \
goto out; \ goto out; \
__ret = __lxc_function; \ __ret = __lxc_function; \
if (__ret) \ if (__ret) \
__errno = errno; \ ___errno = errno; \
__ret2 = lxc_caps_up(); \ __ret2 = lxc_caps_up(); \
out: __ret ? errno = __errno,__ret : __ret2; \ out: __ret ? errno = ___errno,__ret : __ret2; \
}) })
#endif #endif