From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 12 Jan 2024 00:58:28 +0000 (+0100)
Subject: lib/defines.h: Don't wrap #undef in #ifdef
X-Git-Tag: 4.15.0-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1356b14a00cb48c5e18750c76f24dd7e1b112cbd;p=thirdparty%2Fshadow.git

lib/defines.h: Don't wrap #undef in #ifdef

ISO C guarantees that #undef is a no-op if there is no such macro.

C11::6.10.3.5p2:
> A preprocessing directive of the form
>
>       # undef identifier new-line
>
> causes the specified identifier no longer to be defined as a macro
> name.  It is ignored if the specified identifier is not currently
> defined as a macro name.

Link: <http://port70.net/~nsz/c/c11/n1570.html#6.10.3.5p2>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/defines.h b/lib/defines.h
index 361f89c65..93543e858 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -186,12 +186,9 @@
 #define SHADOW_SP_FLAG_UNSET ((unsigned long)-1)
 
 #ifdef WITH_AUDIT
-#ifdef __u8			/* in case we use pam < 0.80 */
+/* in case we use pam < 0.80 */
 #undef __u8
-#endif
-#ifdef __u32
 #undef __u32
-#endif
 
 #include <libaudit.h>
 #endif