diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-06-16 18:16:42 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-06-16 18:16:42 +0000 |
| commit | e82fcbeac17f0c6c71386bb2dc5e15ce930ed9ec (patch) | |
| tree | 8627ae4037de15230a3439ba13380ab3242f6785 | |
| parent | 01d712164d62cbc9a25164fc763ee110baa1639c (diff) | |
| download | tor-e82fcbeac17f0c6c71386bb2dc5e15ce930ed9ec.tar.gz tor-e82fcbeac17f0c6c71386bb2dc5e15ce930ed9ec.zip | |
Partial backport. Clean up a macro/cpp interaction related to bug 707.
svn:r15306
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/or/config.c | 7 |
2 files changed, 9 insertions, 4 deletions
@@ -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 diff --git a/src/or/config.c b/src/or/config.c index 12a40af840..f1742e63d2 100644 --- a/src/or/config.c +++ b/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), |