[or-cvs] [tor/master] Make rotate_request_period use BEGIN/END versions of FOREACH

[nickm@xxxxxxxxxxxxxx]

Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon, 17 May 2010 12:20:52 -0400
Subject: Make rotate_request_period use BEGIN/END versions of FOREACH
Commit: d8a1e2dabbbbfc4a7f945cac978b5ddd97a4ee86

This appeases some versions of MSVC, which don't like it when you
have preprocessor commands inside a set of macro arguments.
---
 src/or/geoip.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/geoip.c b/src/or/geoip.c
index ea11dc3..ad28a77 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -369,7 +369,7 @@ geoip_get_mean_shares(time_t now, double *v2_share_out,
 static void
 rotate_request_period(void)
 {
-  SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, {
+  SMARTLIST_FOREACH_BEGIN(geoip_countries, geoip_country_t *, c) {
 #if REQUEST_HIST_LEN > 1
       memmove(&c->n_v2_ns_requests[0], &c->n_v2_ns_requests[1],
               sizeof(uint32_t)*(REQUEST_HIST_LEN-1));
@@ -378,7 +378,7 @@ rotate_request_period(void)
 #endif
       c->n_v2_ns_requests[REQUEST_HIST_LEN-1] = 0;
       c->n_v3_ns_requests[REQUEST_HIST_LEN-1] = 0;
-    });
+  } SMARTLIST_FOREACH_END(c);
   current_request_period_starts += REQUEST_HIST_PERIOD;
   if (n_old_request_periods < REQUEST_HIST_LEN-1)
     ++n_old_request_periods;
-- 
1.6.5