commit 7e4c91e8808a1ca4b80b02661bd873e2ee636f67 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 15 15:59:52 2012 -0400

Fix a reserved identifier that my scripts missed

My scripts missed it because it was in eventdns.c, which was in ext, but it _was_ using one of our identifiers. That's probably because eventdns.c has drifted a bit since we forked it.

I'm not going to fix the other reserved identifiers in eventdns.c, since that would make it drift even more. --- src/ext/eventdns.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 768693a..7e99f55 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -130,7 +130,7 @@ typedef int socklen_t; #define mm_realloc(x,y) tor_realloc((x),(y)) #define mm_free(x) tor_free(x) #define mm_strdup(x) tor_strdup(x) -#define _mm_free(x) _tor_free(x) +#define _mm_free(x) tor_free_(x)

#undef MIN #define MIN(a,b) ((a)<(b)?(a):(b))