diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-06-13 17:37:53 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-07-20 16:57:35 +0200 |
| commit | 6b228852bccefd515a45f04c801c31ed99607958 (patch) | |
| tree | 8cbe9ec8448a46072d6bc30aba86f2e5e6e09a9d /src/basic | |
| parent | env-util: make env-util.h self contained (diff) | |
| download | systemd-6b228852bccefd515a45f04c801c31ed99607958.tar.xz systemd-6b228852bccefd515a45f04c801c31ed99607958.zip | |
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.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/path-util.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/path-util.h b/src/basic/path-util.h index 8277c6b916..49604eab80 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; \ } \ |