You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2011/03/21 20:35:24 UTC
svn commit: r1083914 - in /apr/apr/branches: 0.9.x/passwd/apr_getpass.c 1.3.x/passwd/apr_getpass.c 1.4.x/passwd/apr_getpass.c 1.5.x/passwd/apr_getpass.c

Author: fuankg
Date: Mon Mar 21 19:35:24 2011
New Revision: 1083914

URL: http://svn.apache.org/viewvc?rev=1083914&view=rev
Log:
Backport of blocking MSVC pragmas (r892909).

Modified:
    apr/apr/branches/0.9.x/passwd/apr_getpass.c
    apr/apr/branches/1.3.x/passwd/apr_getpass.c
    apr/apr/branches/1.4.x/passwd/apr_getpass.c
    apr/apr/branches/1.5.x/passwd/apr_getpass.c

Modified: apr/apr/branches/0.9.x/passwd/apr_getpass.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/passwd/apr_getpass.c?rev=1083914&r1=1083913&r2=1083914&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/passwd/apr_getpass.c (original)
+++ apr/apr/branches/0.9.x/passwd/apr_getpass.c Mon Mar 21 19:35:24 2011
@@ -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>

Modified: apr/apr/branches/1.3.x/passwd/apr_getpass.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/passwd/apr_getpass.c?rev=1083914&r1=1083913&r2=1083914&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/passwd/apr_getpass.c (original)
+++ apr/apr/branches/1.3.x/passwd/apr_getpass.c Mon Mar 21 19:35:24 2011
@@ -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>

Modified: apr/apr/branches/1.4.x/passwd/apr_getpass.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/passwd/apr_getpass.c?rev=1083914&r1=1083913&r2=1083914&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/passwd/apr_getpass.c (original)
+++ apr/apr/branches/1.4.x/passwd/apr_getpass.c Mon Mar 21 19:35:24 2011
@@ -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>

Modified: apr/apr/branches/1.5.x/passwd/apr_getpass.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/passwd/apr_getpass.c?rev=1083914&r1=1083913&r2=1083914&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/passwd/apr_getpass.c (original)
+++ apr/apr/branches/1.5.x/passwd/apr_getpass.c Mon Mar 21 19:35:24 2011
@@ -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>