kludge because openssl and zlib both typedef free_func :(

svn:r208

diff --git a/src/or/or.h b/src/or/or.h
index af5f88140499ca803bd9889823d7faef8fa7ca5f..4871ee3b781bb94ecfc0f03810eadb59fec3d01a 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -37,7 +37,9 @@
 #include <assert.h>
 #include <time.h>
 #ifdef USE_ZLIB
+#define free_func zlib_free_func
 #include <zlib.h>
+#undef free_func
 #endif
 
 #include "../common/crypto.h"