projects
/
srvx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix warnings about shadowed variables, and use -Wshadow in maintainer mode.
[srvx.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 10fb8d0fbec2ddcd986e343b6847f40953aa21ff..a6bb07350926624813bea51db21a84ec6f78cf1d 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-316,6
+316,8
@@
irc_pton(irc_in_addr_t *addr, unsigned char *bits, const char *input)
uint32_t ip4;
pos = irc_pton_ip4(input, bits, &ip4);
if (pos) {
+/* glibc's htons() macro is not -Wshadow-safe. */
+#undef htons
addr->in6[5] = htons(65535);
addr->in6[6] = htons(ntohl(ip4) >> 16);
addr->in6[7] = htons(ntohl(ip4) & 65535);