diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-03-19 22:27:37 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-03-19 22:27:37 +0000 |
| commit | 5d0904bc41f5f559c868cf19bb9683fb939b7c2d (patch) | |
| tree | c4ab4784e29dab51d445592cfe7abc5665e407f6 /src/or | |
| parent | ff14dcdef707f2d1cfed97f17164988c514afb99 (diff) | |
| download | tor-5d0904bc41f5f559c868cf19bb9683fb939b7c2d.tar tor-5d0904bc41f5f559c868cf19bb9683fb939b7c2d.tar.gz | |
kludge because openssl and zlib both typedef free_func :(
svn:r208
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index af5f88140..4871ee3b7 100644 --- 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" |