[or-cvs] kludge because openssl and zlib both typedef free_func :(

Roger Dingledine arma at seul.org
Wed Mar 19 22:27:39 UTC 2003


Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home/arma/work/onion/cvs/src/or

Modified Files:
	or.h 
Log Message:
kludge because openssl and zlib both typedef free_func :(


Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- or.h	19 Mar 2003 20:48:56 -0000	1.53
+++ or.h	19 Mar 2003 22:27:37 -0000	1.54
@@ -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"



More information about the tor-commits mailing list