From c4b790845d76edd2ed2f7ed8973dc194be38123a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Jan 2013 12:24:18 -0500 Subject: [PATCH] caps.h: Rename __errno to ___errno MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Serge E. Hallyn --- src/lxc/caps.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lxc/caps.h b/src/lxc/caps.h index dc3fd6fcf..b5b834575 100644 --- a/src/lxc/caps.h +++ b/src/lxc/caps.h @@ -58,28 +58,28 @@ static inline int lxc_caps_last_cap(void) { #define lxc_priv(__lxc_function) \ ({ \ __label__ out; \ - int __ret, __ret2, __errno = 0; \ + int __ret, __ret2, ___errno = 0; \ __ret = lxc_caps_up(); \ if (__ret) \ goto out; \ __ret = __lxc_function; \ if (__ret) \ - __errno = errno; \ + ___errno = errno; \ __ret2 = lxc_caps_down(); \ - out: __ret ? errno = __errno,__ret : __ret2; \ + out: __ret ? errno = ___errno,__ret : __ret2; \ }) #define lxc_unpriv(__lxc_function) \ ({ \ __label__ out; \ - int __ret, __ret2, __errno = 0; \ + int __ret, __ret2, ___errno = 0; \ __ret = lxc_caps_down(); \ if (__ret) \ goto out; \ __ret = __lxc_function; \ if (__ret) \ - __errno = errno; \ + ___errno = errno; \ __ret2 = lxc_caps_up(); \ - out: __ret ? errno = __errno,__ret : __ret2; \ + out: __ret ? errno = ___errno,__ret : __ret2; \ }) #endif