From 3ec25c2410bfd42e242120f1a3570edc654e2ed9 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 28 Jun 2008 04:16:17 +0000
Subject:  r16587@tombo:  nickm | 2008-06-28 00:13:40 -0400  fix for bug 704;
 found by sjmurdoch.  Windows and recent openssl both want to define
 OCSP_RESPONSE; do not let them.

svn:r15533
---
 src/common/crypto.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/common')

diff --git a/src/common/crypto.c b/src/common/crypto.c
index eb1af30da..67d36d73c 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -21,6 +21,9 @@ const char crypto_c_id[] =
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <wincrypt.h>
+/* Windows defines this; so does openssl 0.9.8h and later. We don't actually
+ * use either definition. */
+#undef OCSP_RESPONSE
 #endif
 
 #include <openssl/err.h>
-- 
cgit v1.2.3