diff options
| -rw-r--r-- | src/or/circuitlist.c | 4 | ||||
| -rw-r--r-- | src/or/control.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index c45d4f2b20..00db45a242 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -11,6 +11,10 @@ const char circuitlist_c_id[] = "$Id$"; **/ #include "or.h" + +/* Define RB_AUGMENT to avoid warnings about if statements with emtpy bodies. + */ +#define RB_AUGMENT(x) do{}while(0) #include "tree.h" /********* START VARIABLES **********/ diff --git a/src/or/control.c b/src/or/control.c index 4bdfdc0582..bfaf4555e8 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -319,7 +319,7 @@ write_escaped_data(const char *data, size_t len, int translate_newlines, *outp++ = '\r'; *outp++ = '\n'; *outp = '\0'; /* NUL-terminate just in case. */ - tor_assert((outp - *out) <= (sz_out)); + tor_assert((outp - *out) <= (int)sz_out); return outp - *out; } |