From 6b228852bccefd515a45f04c801c31ed99607958 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 13 Jun 2018 17:37:53 +0200 Subject: [PATCH] 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. --- src/basic/path-util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; \ } \ -- 2.47.3