diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-13 15:11:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-13 15:11:52 -0400 |
| commit | 283730ad1cdd911d1a669ea730741f35aa6b7f66 (patch) | |
| tree | 7b69cdcb56243d11b47894217ce955b3817460c4 | |
| parent | 9114346d323f3fe7c261bfcee89556bab4f88d48 (diff) | |
| parent | 789c8d8573b9969acd808bb19d211d4ae9ac3be4 (diff) | |
| download | tor-283730ad1cdd911d1a669ea730741f35aa6b7f66.tar.gz tor-283730ad1cdd911d1a669ea730741f35aa6b7f66.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
| -rw-r--r-- | changes/test.h_msvc | 3 | ||||
| -rw-r--r-- | src/test/test.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/test.h_msvc b/changes/test.h_msvc new file mode 100644 index 0000000000..3afbc13aaa --- /dev/null +++ b/changes/test.h_msvc @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix compilation of test.h with MSVC. Patch from Gisle Vanem; + bugfix on 0.2.5.5-alpha. diff --git a/src/test/test.h b/src/test/test.h index 861ce5ac3e..b9e4d5bdb4 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -61,7 +61,7 @@ #ifdef _MSC_VER #define U64_PRINTF_TYPE uint64_t -#define U64_PRINTF_TYPE int64_t +#define I64_PRINTF_TYPE int64_t #else #define U64_PRINTF_TYPE unsigned long long #define I64_PRINTF_TYPE long long |