[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[or-cvs] kludge because openssl and zlib both typedef free_func :(
- To: or-cvs@freehaven.net
- Subject: [or-cvs] kludge because openssl and zlib both typedef free_func :(
- From: arma@seul.org (Roger Dingledine)
- Date: Wed, 19 Mar 2003 17:27:39 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Wed, 19 Mar 2003 17:27:40 -0500
- Reply-to: or-dev@freehaven.net
- Sender: owner-or-cvs@freehaven.net
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"