From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 3 Jan 2013 17:24:18 +0000 (-0500)
Subject: caps.h: Rename __errno to ___errno
X-Git-Tag: lxc-0.9.0.alpha3~1^2~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4b790845d76edd2ed2f7ed8973dc194be38123a;p=thirdparty%2Flxc.git

caps.h: Rename __errno to ___errno

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>
---

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