| commit | 1a52e39c22d522a8c4a23615f90b7f4560c2a9a2 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 8 Jun 2010 22:10:20 +0000 (8 18:10 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Wed, 23 Jun 2010 03:25:08 +0000 (22 23:25 -0400) | ||
| tree | d46e0151faafa3cc99767935c44155126afa7624 | treesnapshot (tar.gz zip) |
| parent | 2f67ef58b796379a45a8b4e24847ea62a26aa853 | commitdiff |
Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
From the code:
zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of
saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory
that nobody will care if the compile outputs a no-such-identifier warning.
Sorry, but we like -Werror over here, so I guess we need to define these.
I hope that zlib 1.2.6 doesn't break these too.
Possible fix for bug 1526.
From the code:
zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of
saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory
that nobody will care if the compile outputs a no-such-identifier warning.
Sorry, but we like -Werror over here, so I guess we need to define these.
I hope that zlib 1.2.6 doesn't break these too.
Possible fix for bug 1526.
| changes/bug1526 | [new file with mode: 0644] | blob |
| src/common/torgzip.c | diffblobblamehistory |