summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-31 10:42:41 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-31 10:42:41 -0500
commit48424772aa9a7b3ed4710471a205a841d69337bd (patch)
tree9dc6e9ec25b1015eb8593cd88d0cf130bcf1dcc0
parent2b29c8f48f5c4b9b172e5975adba61a72a275a7a (diff)
downloadtor-48424772aa9a7b3ed4710471a205a841d69337bd.tar.gz
tor-48424772aa9a7b3ed4710471a205a841d69337bd.zip
Actually enable the windows absolute-path code
Checking for "WINDOWS" is wrong; our magic macro is MS_WINDOWS Fixes bug 4973; bugfix on 0.2.3.11-alpha.
-rw-r--r--changes/bug49733
-rw-r--r--src/common/compat.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug4973 b/changes/bug4973
new file mode 100644
index 0000000000..dd3ad690b7
--- /dev/null
+++ b/changes/bug4973
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+ - Calculate absolute paths correctly on Windows. Fixes bug 4973;
+ bugfix on 0.2.3.11-alpha.
diff --git a/src/common/compat.c b/src/common/compat.c
index 4af670a18d..cd112035c6 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1628,7 +1628,7 @@ get_parent_directory(char *fname)
char *
make_path_absolute(char *fname)
{
-#ifdef WINDOWS
+#ifdef MS_WINDOWS
char *absfname_malloced = _fullpath(NULL, fname, 1);
/* We don't want to assume that tor_free can free a string allocated