summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-08-02 18:44:00 +0200
committerSebastian Hahn <sebastian@torproject.org>2010-08-02 18:45:17 +0200
commita9d055c5c516924b2e87e416b154bf220b0a914e (patch)
tree2601ad1dc7ca2fe4cdbfd4901a6a27c1868497d8 /src
parent883af78a9d536562345d2713edebb13f8978a72a (diff)
downloadtor-a9d055c5c516924b2e87e416b154bf220b0a914e.tar.gz
tor-a9d055c5c516924b2e87e416b154bf220b0a914e.zip
Fix a compile warning on OS X 10.6
Also update the changes file to contain a note on which bug was fixed by this.
Diffstat (limited to 'src')
-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 34bad4c6b2..0a26c84be7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1761,7 +1761,7 @@ config_assign_line(config_format_t *fmt, or_options_t *options,
var->type != CONFIG_TYPE_LINELIST_S)) {
/* We're tracking which options we've seen, and this option is not
* supposed to occur more than once. */
- int var_index = var - fmt->vars;
+ int var_index = (int)(var - fmt->vars);
if (bitarray_is_set(options_seen, var_index)) {
log_warn(LD_CONFIG, "Option '%s' used more than once; all but the last "
"value will be ignored.", var->name);