From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 31 Aug 2011 00:35:17 +0000 (-0400)
Subject: Switch a SMARTLIST_FOREACH in circuitbuild.c to BEGIN/END
X-Git-Tag: tor-0.2.2.33~8^2^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=561ab14a5ed64dd3994fe23073e74efa3498e589;p=thirdparty%2Ftor.git

Switch a SMARTLIST_FOREACH in circuitbuild.c to BEGIN/END

It had some cpp stuff inside, and older GCCs don't like preprocessor
directives inside macro arguments.

Found by grarpamp.
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index a63e89b126..3c1f63a9cd 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -4095,7 +4095,7 @@ choose_random_entry(cpath_build_state_t *state)
 
  retry:
   smartlist_clear(live_entry_guards);
-  SMARTLIST_FOREACH(entry_guards, entry_guard_t *, entry,
+  SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry)
     {
       const char *msg;
       r = entry_is_live(entry, need_uptime, need_capacity, 0, &msg);
@@ -4131,7 +4131,8 @@ choose_random_entry(cpath_build_state_t *state)
       }
       if (smartlist_len(live_entry_guards) >= options->NumEntryGuards)
         break; /* we have enough */
-    });
+    }
+  SMARTLIST_FOREACH_END(entry);
 
   if (entry_list_is_constrained(options)) {
     /* If we prefer the entry nodes we've got, and we have at least