r16252@catbus: nickm | 2007-10-29 11:13:03 -0400

 Change symbol from DATADIR to SHARE_DATADIR, since DATADIR conflicts with objidl.h in mingw.

svn:r12268

diff --git a/configure.in b/configure.in
index 08adf087df3976013958e1d85b1e814633f004c3..3abcf2648ea8a4b07958287216d50384b4b867a7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -620,10 +620,11 @@ AH_TEMPLATE([LOCALSTATEDIR], [Default location to store state files.])
 AC_DEFINE_UNQUOTED(LOCALSTATEDIR,"$LOCALSTATEDIR")
 
 dnl Note: this is not the same as Tor's "DataDir" config option.
-DATADIR=`eval echo $datadir`
-AC_SUBST(DATADIR)
-AH_TEMPLATE([DATADIR], [Default location for platform-independent read-only data.])
-AC_DEFINE_UNQUOTED(DATADIR,"$DATADIR")
+dnl   We'd call it 'DATADIR', except that's a symbol in MinGW's objidl.h.  
+SHARE_DATADIR=`eval echo $datadir`
+AC_SUBST(SHARE_DATADIR)
+AH_TEMPLATE([SHARE_DATADIR], [Default location for platform-independent read-only data.])
+AC_DEFINE_UNQUOTED(SHARE_DATADIR,"$SHARE_DATADIR")
 
 # Set CFLAGS _after_ all the above checks, since our warnings are stricter
 # than autoconf's macros like.

diff --git a/doc/TODO b/doc/TODO
index 96711794b95f52d03b67c500c791d8b54b7e167d..07a335400ed71d95d83b07ba3047fffa4a312eed 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -31,7 +31,7 @@ Things we'd like to do in 0.2.0.x:
     o base Guard flag on WFU rather than on MTBF.
       o Change guard calculation
       o Change dir-spec.txt
-      - What should we do about hosts that have been up for only 1 hour,
+      o What should we do about hosts that have been up for only 1 hour,
         but have been up for 100% of that one hour? -NM
         Perhaps the guard flag should only be assigned if the measurement
         period for that server is at least some large period, like a

diff --git a/src/or/config.c b/src/or/config.c
index 1f9e7b0af697d06f4e7f336b2dcd868ca4be1f41..6f66ce258b3d4040a2d2b0dd4115df664a3eca9f 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -178,7 +178,7 @@ static config_var_t _option_vars[] = {
   V(ExitPolicy,                  LINELIST, NULL),
   V(ExitPolicyRejectPrivate,     BOOL,     "1"),
   V(FallbackNetworkstatusFile,   STRING,
-    DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "fallback-consensus"),
+    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "fallback-consensus"),
   V(FascistFirewall,             BOOL,     "0"),
   V(FirewallPorts,               CSV,      ""),
   V(FastFirstHopPK,              BOOL,     "1"),