diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-06-16 18:35:34 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-06-16 18:35:34 +0000 |
| commit | dfdb74961c835c0903fa1694b2e2970f1fae76de (patch) | |
| tree | f2af01762338c52314bc6a01c823c8e7ad086393 | |
| parent | e82fcbeac17f0c6c71386bb2dc5e15ce930ed9ec (diff) | |
| download | tor-dfdb74961c835c0903fa1694b2e2970f1fae76de.tar.gz tor-dfdb74961c835c0903fa1694b2e2970f1fae76de.zip | |
Backport: More bug 707 fixes: no #if/#endif pairs inside macro arguments.
svn:r15308
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/or/routerlist.c | 10 |
2 files changed, 7 insertions, 8 deletions
@@ -1,7 +1,8 @@ Changes in version 0.2.0.29 - 2008-06-13 o Minor bugfixes: - - Fix a macro/CPP interactions that was confusing some compilers. - + - Fix a macro/CPP interactions that was confusing some compilers: + some GCCs don't like #if/#endif pairs inside macro arguments. + Fix for bug 707. Changes in version 0.2.0.28-rc - 2008-06-13 diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5d2c65cd11..998e649124 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4391,7 +4391,6 @@ routerlist_assert_ok(routerlist_t *rl) r->cache_info.signed_descriptor_digest); tor_assert(&(r->cache_info) == sd2); tor_assert(r->cache_info.routerlist_index == r_sl_idx); -#if 0 /* XXXX021. * * Hoo boy. We need to fix this one, and the fix is a bit tricky, so @@ -4409,13 +4408,13 @@ routerlist_assert_ok(routerlist_t *rl) * reset our retry count for an extrainfo, but that's not the end * of the world. Changing the representation in 0.2.0.x would just * destabilize the codebase. - */ + if (!tor_digest_is_zero(r->cache_info.extra_info_digest)) { signed_descriptor_t *sd3 = sdmap_get(rl->desc_by_eid_map, r->cache_info.extra_info_digest); tor_assert(sd3 == &(r->cache_info)); } -#endif + */ }); SMARTLIST_FOREACH(rl->old_routers, signed_descriptor_t *, sd, { @@ -4424,14 +4423,13 @@ routerlist_assert_ok(routerlist_t *rl) sd2 = sdmap_get(rl->desc_digest_map, sd->signed_descriptor_digest); tor_assert(sd == sd2); tor_assert(sd->routerlist_index == sd_sl_idx); -#if 0 - /* XXXX021 see above. */ + /* XXXX021 see above. if (!tor_digest_is_zero(sd->extra_info_digest)) { signed_descriptor_t *sd3 = sdmap_get(rl->desc_by_eid_map, sd->extra_info_digest); tor_assert(sd3 == sd); } -#endif + */ }); RIMAP_FOREACH(rl->identity_map, d, r) { |