summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuankg <fuankg@13f79535-47bb-0310-9956-ffa450edef68>2011-03-21 19:35:24 +0000
committerfuankg <fuankg@13f79535-47bb-0310-9956-ffa450edef68>2011-03-21 19:35:24 +0000
commit36dcd849df537082f6e21849c7e0b1e396005f60 (patch)
tree232e9b6054613cacb6443ceb22001ccec64827bd
parentaffbab2576a34c7c31564453c99eb2edb019e23d (diff)
downloadlibapr-36dcd849df537082f6e21849c7e0b1e396005f60.tar.gz
Backport of blocking MSVC pragmas (r892909).
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@1083914 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--passwd/apr_getpass.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/passwd/apr_getpass.c b/passwd/apr_getpass.c
index 5b2186a1e..a72807e9c 100644
--- a/passwd/apr_getpass.c
+++ b/passwd/apr_getpass.c
@@ -34,9 +34,13 @@
#include <unistd.h>
#endif
#if APR_HAVE_CONIO_H
+#ifdef _MSC_VER
#pragma warning(disable: 4032)
#include <conio.h>
#pragma warning(default: 4032)
+#else
+#include <conio.h>
+#endif
#endif
#if APR_HAVE_STDLIB_H
#include <stdlib.h>