summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-06-04 06:35:42 +0000
committerRoger Dingledine <arma@torproject.org>2008-06-04 06:35:42 +0000
commitf3d3d4451f1cfdf0bae882efe9cda6f0af6e457f (patch)
treec905fb69fbdb69c84fc0f5069855d5857e19f6c3
parente361de2365719f544b92cd6aee46a1f9ed657ae2 (diff)
downloadtor-f3d3d4451f1cfdf0bae882efe9cda6f0af6e457f.tar.gz
tor-f3d3d4451f1cfdf0bae882efe9cda6f0af6e457f.zip
Fix compile on Windows, maybe.
svn:r14927
-rw-r--r--ChangeLog1
-rw-r--r--src/or/config.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 53ae253349..8a633170f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
Changes in version 0.2.0.28-rc - 2008-06-??
o Minor fixes:
- Fix unit tests in 0.2.0.27-rc. [Actually, one is still broken!]
+ - Fix compile on Windows.
Changes in version 0.2.0.27-rc - 2008-06-03
diff --git a/src/or/config.c b/src/or/config.c
index b84b5fe27d..90ebebd799 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -606,6 +606,9 @@ typedef struct {
*(uint32_t*)STRUCT_VAR_P(cfg,fmt->magic_offset)); \
STMT_END
+#ifdef MS_WINDOWS
+static char *get_windows_conf_root(void);
+#endif
static void config_line_append(config_line_t **lst,
const char *key, const char *val);
static void option_clear(config_format_t *fmt, or_options_t *options,