From d5d26e3269cea38f1cdcd060560ad5d1e3e23589 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 15 Feb 2011 16:18:58 +1100 Subject: [PATCH] uid-wrapper: handle uwrap_enabled() as a macro some s3 code defines uwrap_enabled() as a macro. Detect this, and don't redeclare the functions Pair-Programmed-With: Andrew Bartlett --- lib/uid_wrapper/uid_wrapper.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/uid_wrapper/uid_wrapper.h b/lib/uid_wrapper/uid_wrapper.h index 3d422238829..b3b11d954ae 100644 --- a/lib/uid_wrapper/uid_wrapper.h +++ b/lib/uid_wrapper/uid_wrapper.h @@ -17,6 +17,7 @@ #ifndef __UID_WRAPPER_H__ #define __UID_WRAPPER_H__ +#ifndef uwrap_enabled int uwrap_enabled(void); int uwrap_seteuid(uid_t euid); @@ -68,4 +69,5 @@ gid_t uwrap_getgid(void); #endif #define getgid uwrap_getgid +#endif #endif /* __UID_WRAPPER_H__ */