[or-cvs] Oops. It looks like some old GCCs dislike #if inside a macr...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv20287/src/or

Modified Files:
	routerlist.c 
Log Message:
Oops. It looks like some old GCCs dislike #if inside a macro argument.

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- routerlist.c	23 Sep 2005 18:17:37 -0000	1.313
+++ routerlist.c	23 Sep 2005 20:31:07 -0000	1.314
@@ -2432,21 +2432,18 @@
         // log_fn(LOG_NOTICE, "Up-to-date status for %s", fp);
         rs->should_download = 0;
         --n_downloadable;
-      }
-#if 0
-      else {
+      } /* else {
         char t1[ISO_TIME_LEN+1];
         char t2[ISO_TIME_LEN+1];
-        format_iso_time(t1, rs->published_on);
+        format_iso_time(t1, rs->satus.published_on);
         format_iso_time(t2, ri->published_on);
         log_fn(LOG_NOTICE, "Out-of-date status for %s %s (%d %d) [%s %s]", fp,
                ri->nickname,
-               !memcmp(ri->signed_descriptor_digest,rs->descriptor_digest,DIGEST_LEN),
+               !memcmp(ri->signed_descriptor_digest,rs->status.descriptor_digest,
+                       DIGEST_LEN),
                rs->published_on < ri->published_on,
                t1, t2);
-
-      }
-#endif
+      } */
     });
   }