mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 05:03:43 +01:00
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
This commit is contained in:
parent
28652aec69
commit
1c451b9db9
@ -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.
|
||||
|
2
doc/TODO
2
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
|
||||
|
@ -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"),
|
||||
|
Loading…
Reference in New Issue
Block a user