diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-07-07 10:55:51 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-07-07 10:55:51 -0400 |
commit | 48e45e2fb1efa37dd08373e969d339c785585a7d (patch) | |
tree | 87cafd802b8611e5c660ef224cc08a20eb461a3d | |
parent | c1e4aff384c483f64c66775011719267059f6915 (diff) | |
parent | ae756f251ffe155336deef0bb97643203d1cfa56 (diff) | |
download | tor-48e45e2fb1efa37dd08373e969d339c785585a7d.tar.gz tor-48e45e2fb1efa37dd08373e969d339c785585a7d.zip |
Merge branch 'bug22838_028' into maint-0.2.8
-rw-r--r-- | changes/bug22838_028 | 5 | ||||
-rw-r--r-- | src/test/test_switch_id.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug22838_028 b/changes/bug22838_028 new file mode 100644 index 0000000000..1d0a4fbfd1 --- /dev/null +++ b/changes/bug22838_028 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation, mingw, backport from 0.3.1.1-alpha): + - Backport a fix for an "unused variable" warning that appeared + in some versions of mingw. Fixes bug 22838; bugfix on + 0.2.8.1-alpha. + diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 322f5bdc7a..e12205bb2e 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -79,6 +79,7 @@ main(int argc, char **argv) #if defined(_WIN32) (void) argc; (void) argv; + (void) which_test; fprintf(stderr, "This test is not supported on your OS.\n"); return 77; |