From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 13 Jun 2018 15:37:53 +0000 (+0200)
Subject: path-util: avoid name clashes
X-Git-Tag: v240~892^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b228852bccefd515a45f04c801c31ed99607958;p=thirdparty%2Fsystemd.git

path-util: avoid name clashes

One of those days we should rework this to use the UNIQ macros, but for
now, an underscore should be enough.
---

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 8277c6b9165..49604eab800 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -58,10 +58,10 @@ static inline bool path_equal_ptr(const char *a, const char *b) {
 /* Note: the search terminates on the first NULL item. */
 #define PATH_IN_SET(p, ...)                                     \
         ({                                                      \
-                char **s;                                       \
+                char **_s;                                      \
                 bool _found = false;                            \
-                STRV_FOREACH(s, STRV_MAKE(__VA_ARGS__))         \
-                        if (path_equal(p, *s)) {                \
+                STRV_FOREACH(_s, STRV_MAKE(__VA_ARGS__))        \
+                        if (path_equal(p, *_s)) {               \
                                _found = true;                   \
                                break;                           \
                         }                                       \