projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utils.h: Avoid name clashes for setbit/delbit/hasbit
[project/firewall3.git]
/
options.c
diff --git
a/options.c
b/options.c
index
407931b
..
d88d3ba
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-718,7
+718,7
@@
fw3_parse_weekdays(void *ptr, const char *val, bool is_list)
if (*val == '!')
{
if (*val == '!')
{
- setbit(*(uint8_t *)ptr, 0);
+
fw3_
setbit(*(uint8_t *)ptr, 0);
while (isspace(*++val));
}
while (isspace(*++val));
}
@@
-738,7
+738,7
@@
fw3_parse_weekdays(void *ptr, const char *val, bool is_list)
}
}
}
}
- setbit(*(uint8_t *)ptr, w);
+
fw3_
setbit(*(uint8_t *)ptr, w);
}
free(s);
}
free(s);
@@
-753,7
+753,7
@@
fw3_parse_monthdays(void *ptr, const char *val, bool is_list)
if (*val == '!')
{
if (*val == '!')
{
- setbit(*(uint32_t *)ptr, 0);
+
fw3_
setbit(*(uint32_t *)ptr, 0);
while (isspace(*++val));
}
while (isspace(*++val));
}
@@
-770,7
+770,7
@@
fw3_parse_monthdays(void *ptr, const char *val, bool is_list)
return false;
}
return false;
}
- setbit(*(uint32_t *)ptr, d);
+
fw3_
setbit(*(uint32_t *)ptr, d);
}
free(s);
}
free(s);