Partial backport. Clean up a macro/cpp interaction related to bug 707.

svn:r15306

ChangeLog

@@ -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

src/or/config.c

@@ -198,13 +198,12 @@ static config_var_t _option_vars[] = {
   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),