diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-05-01 01:02:43 +0400 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-09-30 23:33:25 +0400 |
| commit | 35b8dcf8c3a0be1feb1c8b29b22e1685ba0c2e14 (patch) | |
| tree | a7669bac2c6b0f0f0dc845e58f483c5426f65f17 /include/linux | |
| parent | a0f28dc754bb6e78158eb41bf729342f7c2bcd70 (diff) | |
| download | linux-35b8dcf8c3a0be1feb1c8b29b22e1685ba0c2e14.tar.xz | |
netfilter: ipset: Rename simple macro names to avoid namespace issues.
Reported-by: David Laight <David.Laight@ACULAB.COM>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h index 9ac9fbde7b61..f900f33a5f3d 100644 --- a/include/linux/netfilter/ipset/ip_set.h +++ b/include/linux/netfilter/ipset/ip_set.h @@ -398,4 +398,7 @@ bitmap_bytes(u32 a, u32 b) { .bytes = ULLONG_MAX, .packets = ULLONG_MAX, \ .timeout = (map)->timeout } +#define IPSET_CONCAT(a, b) a##b +#define IPSET_TOKEN(a, b) IPSET_CONCAT(a, b) + #endif /*_IP_SET_H */ |