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>

caps.h: Rename errno to _errno
c4b79084 · Stéphane Graber · 956edc54 · c4b79084
Commit c4b79084 authored Jan 03, 2013 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

caps.h src/lxc/caps.h +6 -6

No files found.
--- 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