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 8277c6b9165a8f830164dc37e2ed1b415a862460..49604eab800728358d3caa0437870eb3e1dbab6c 100644 (file)
--- 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;                           \
                         }                                       \