From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 12 Jul 2015 19:02:43 +0000 (-0400)
Subject: Dammit, autoconf!
X-Git-Tag: tor-0.2.7.2-alpha~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f21c85e049f3c2bc65c8edb88d540f43814b522;p=thirdparty%2Ftor.git

Dammit, autoconf!
---

diff --git a/src/common/compat.c b/src/common/compat.c
index 69c47052c8..a32a1af1d6 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -73,13 +73,13 @@
 #include <conio.h>
 #include <wchar.h>
 /* Some mingw headers lack these. :p */
-#ifndef HAVE_DECL__GETWCH
+#if defined(HAVE_DECL__GETWCH) && !HAVE_DECL__GETWCH
 wint_t _getwch(void);
 #endif
 #ifndef WEOF
 #define WEOF (wchar_t)(0xFFFF)
 #endif
-#ifndef HAVE_DECL_SECUREZEROMEMORY
+#if defined(HAVE_DECL_SECUREZEROMEMORY) && !HAVE_DECL_SECUREZEROMEMORY
 PVOID SecureZeroMemory(PVOID ptr, SIZE_T cnt);
 #endif
 #elif defined(HAVE_READPASSPHRASE_H)