[tor-commits] [tor/master] Dammit, autoconf!

[nickm at torproject.org]

commit 9f21c85e049f3c2bc65c8edb88d540f43814b522
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jul 12 15:02:43 2015 -0400

    Dammit, autoconf!
---
 src/common/compat.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index 69c4705..a32a1af 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)