summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-13 15:11:00 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-13 15:11:00 -0400
commit789c8d8573b9969acd808bb19d211d4ae9ac3be4 (patch)
tree41feec90f65f1e34352dfe151110d407e5921daf
parentfa7ce6d3be62061de73176ffb939aa8d353d4014 (diff)
downloadtor-789c8d8573b9969acd808bb19d211d4ae9ac3be4.tar.gz
tor-789c8d8573b9969acd808bb19d211d4ae9ac3be4.zip
Apply an MSVC compilation fix from Gisle Vanem
This fixes a double-define introduced in 28538069b2f1909a7600ec6d
-rw-r--r--changes/test.h_msvc3
-rw-r--r--src/test/test.h2
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