diff options
| -rw-r--r-- | src/common/util.h | 6 | ||||
| -rw-r--r-- | src/or/dirserv.c | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/common/util.h b/src/common/util.h index 1d524cf66..7a0335935 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -136,6 +136,12 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, #define SUBTYPE_P(p, subtype, basemember) \ ((void*) ( ((char*)(p)) - STRUCT_OFFSET(subtype, basemember) )) +/* Logic */ +/** Macro: true if two values have the same boolean value. */ +#define bool_eq(a,b) (!(a)==!(b)) +/** Macro: true if two values have different boolean values. */ +#define bool_neq(a,b) (!(a)!=!(b)) + /* String manipulation */ /** Allowable characters in a hexadecimal string. */ diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fa6ecef31..0ee7fc067 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -582,14 +582,6 @@ dirserv_add_descriptor(const char *desc, const char **msg) } } -/** Helper: return true iff the boolean values of <b>a</b> and <b>b</b> are - * different. */ -static INLINE int -bool_neq(int a, int b) -{ - return (a) ? !b : b; -} - /** Remove all descriptors whose nicknames or fingerprints no longer * are allowed by our fingerprint list. (Descriptors that used to be * good can become bad when we reload the fingerprint list.) |