From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Aug 2014 19:11:00 +0000 (-0400)
Subject: Apply an MSVC compilation fix from Gisle Vanem
X-Git-Tag: tor-0.2.6.1-alpha~207^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=789c8d8573b9969acd808bb19d211d4ae9ac3be4;p=thirdparty%2Ftor.git

Apply an MSVC compilation fix from Gisle Vanem

This fixes a double-define introduced in 28538069b2f1909a7600ec6d
---

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