suppress all our usual compiler warnings, including a longstanding one from tree.h

svn:r5149

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 **********/

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;
 }