[or-cvs] r12268: Change symbol from DATADIR to SHARE_DATADIR, since DATADIR c (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-29 11:15:49 -0400 (Mon, 29 Oct 2007)
New Revision: 12268

Modified:
   tor/trunk/
   tor/trunk/configure.in
   tor/trunk/doc/TODO
   tor/trunk/src/or/config.c
Log:
 r16252 at catbus:  nickm | 2007-10-29 11:13:03 -0400
 Change symbol from DATADIR to SHARE_DATADIR, since DATADIR conflicts with objidl.h in mingw.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16252] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-10-29 01:08:22 UTC (rev 12267)
+++ tor/trunk/configure.in	2007-10-29 15:15:49 UTC (rev 12268)
@@ -620,10 +620,11 @@
 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.

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-10-29 01:08:22 UTC (rev 12267)
+++ tor/trunk/doc/TODO	2007-10-29 15:15:49 UTC (rev 12268)
@@ -31,7 +31,7 @@
     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

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-10-29 01:08:22 UTC (rev 12267)
+++ tor/trunk/src/or/config.c	2007-10-29 15:15:49 UTC (rev 12268)
@@ -178,7 +178,7 @@
   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"),