[or-cvs] r15306: Partial backport. Clean up a macro/cpp interaction related t (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-06-16 14:16:42 -0400 (Mon, 16 Jun 2008)
New Revision: 15306

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/config.c
Log:
Partial backport. Clean up a macro/cpp interaction related to bug 707.

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-16 18:09:53 UTC (rev 15305)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-16 18:16:42 UTC (rev 15306)
@@ -1,3 +1,9 @@
+Changes in version 0.2.0.29 - 2008-06-13
+  o Minor bugfixes:
+    - Fix a macro/CPP interactions that was confusing some compilers.
+      
+
+
 Changes in version 0.2.0.28-rc - 2008-06-13
   o Anonymity fixes:
     - Fix a bug where, when we were choosing the 'end stream reason' to

Modified: tor/branches/tor-0_2_0-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/config.c	2008-06-16 18:09:53 UTC (rev 15305)
+++ tor/branches/tor-0_2_0-patches/src/or/config.c	2008-06-16 18:16:42 UTC (rev 15306)
@@ -198,13 +198,12 @@
   V(FetchServerDescriptors,      BOOL,     "1"),
   V(FetchHidServDescriptors,     BOOL,     "1"),
   V(FetchUselessDescriptors,     BOOL,     "0"),
-  V(GeoIPFile,                   STRING,
 #ifdef WIN32
-    "<default>"
+  V(GeoIPFile,                   STRING,   "<default>"),
 #else
-    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"
+  V(GeoIPFile,                   STRING,
+    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
 #endif
-),
   V(Group,                       STRING,   NULL),
   V(HardwareAccel,               BOOL,     "0"),
   V(HashedControlPassword,       LINELIST, NULL),