X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils.h;h=c74a5dd76d22fcab5b7e496ed2582899302e9923;hb=c328d1f6fe982888b5f5852423ee0a41cee3adb1;hp=166ac26cfd0768a511e9215cef284996d777e68d;hpb=be8ead27f625b3e4ed383f270dcfee2d158231ec;p=project%2Ffirewall3.git diff --git a/utils.h b/utils.h index 166ac26..c74a5dd 100644 --- a/utils.h +++ b/utils.h @@ -46,13 +46,13 @@ void warn(const char *format, ...); void error(const char *format, ...); void info(const char *format, ...); -#define setbit(field, flag) field |= (1 << (flag)) -#define delbit(field, flag) field &= ~(1 << (flag)) -#define hasbit(field, flag) (field & (1 << (flag))) +#define fw3_setbit(field, flag) field |= (1 << (flag)) +#define fw3_delbit(field, flag) field &= ~(1 << (flag)) +#define fw3_hasbit(field, flag) (field & (1 << (flag))) -#define set(field, family, flag) setbit(field[family == FW3_FAMILY_V6], flag) -#define del(field, family, flag) delbit(field[family == FW3_FAMILY_V6], flag) -#define has(field, family, flag) hasbit(field[family == FW3_FAMILY_V6], flag) +#define set(field, family, flag) fw3_setbit(field[family == FW3_FAMILY_V6], flag) +#define del(field, family, flag) fw3_delbit(field[family == FW3_FAMILY_V6], flag) +#define has(field, family, flag) fw3_hasbit(field[family == FW3_FAMILY_V6], flag) #define fw3_foreach(p, h) \ for (p = list_empty(h) ? NULL : list_first_entry(h, typeof(*p), list); \