diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-02 10:12:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-02 10:12:56 -0400 |
| commit | a32ca313c4bc67d56af5f345fa0129b50c006b12 (patch) | |
| tree | aca71f0e71783cbb7ec19ba888667e2b755e8282 | |
| parent | f25806409d34ab675e01a30347b4995c741a6287 (diff) | |
| parent | 5854b19816bc7b09df4785afbfb0e8891b398638 (diff) | |
| download | tor-a32ca313c4bc67d56af5f345fa0129b50c006b12.tar.gz tor-a32ca313c4bc67d56af5f345fa0129b50c006b12.zip | |
Merge branch 'maint-0.2.7' into maint-0.2.8
| -rw-r--r-- | changes/bug19213 | 3 | ||||
| -rw-r--r-- | src/test/test_util.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug19213 b/changes/bug19213 new file mode 100644 index 0000000000..f912ffb0c3 --- /dev/null +++ b/changes/bug19213 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Cause the unit tests to compile correctly on mingw64 versions + that lack sscanf. Fixes bug 19213. Bugfix on 0.2.7.1-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index 21ff75741a..d534cc0b52 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4679,7 +4679,7 @@ test_util_writepid(void *arg) contents = read_file_to_str(fname, 0, NULL); tt_assert(contents); - int n = sscanf(contents, "%lu\n%c", &pid, &c); + int n = tor_sscanf(contents, "%lu\n%c", &pid, &c); tt_int_op(n, OP_EQ, 1); #ifdef _WIN32 |