summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorMike Chiussi <chiussi@gmail.com>2006-09-06 01:49:55 +0000
committerMike Chiussi <chiussi@gmail.com>2006-09-06 01:49:55 +0000
commit6ec9c1092afbed894e2c52328257aa295e2df6fc (patch)
tree2ed5fa131a4d9ebef8eb425d4a44d41a8f3d3090 /src/or/config.c
parent585ae267836326b50d33372f0129bc6fac1d1ad5 (diff)
downloadtor-6ec9c1092afbed894e2c52328257aa295e2df6fc.tar.gz
tor-6ec9c1092afbed894e2c52328257aa295e2df6fc.zip
- made configure check if we are building for win32
- made configure link to required system dll's if building for win32 - added diffs for libevent 1.1b - forced user to turn off eventdns if win32 is set - cleaned up tor_mmap_file()_win32 (not sure if it's stable) - cleaned up some warnings and typos svn:r8322
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 29f41ee3bb..146107ead7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2757,11 +2757,11 @@ options_init_from_torrc(int argc, char **argv)
if (using_default_torrc) {
/* didn't find one, try CONFDIR */
const char *dflt = get_default_conf_file();
- char *fn = NULL;
if (dflt && file_status(dflt) == FN_FILE) {
fname = tor_strdup(dflt);
} else {
#ifndef MS_WINDOWS
+ char *fn;
fn = expand_filename("~/.torrc");
if (fn && file_status(fn) == FN_FILE) {
fname = fn;