From: Guenter Knauf <fuankg@apache.org>
Date: Wed, 19 Jun 2013 11:51:57 +0000 (+0000)
Subject: sync with trunk to silent compiler warnings.
X-Git-Tag: 2.4.5~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8111c3b7c84cd9e88334374e1f81f543a64ad4bf;p=apache

sync with trunk to silent compiler warnings.
Backport of r1481677, r1494317, r1488496.
Reviewed by: fuankg, gsmith, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1494568 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/passwd_common.c b/support/passwd_common.c
index 395dc93450..343fa79064 100644
--- a/support/passwd_common.c
+++ b/support/passwd_common.c
@@ -24,8 +24,10 @@
 
 #include "apr_md5.h"
 #include "apr_sha1.h"
-#include <time.h>
 
+#if APR_HAVE_TIME_H
+#include <time.h>
+#endif
 #if APR_HAVE_CRYPT_H
 #include <crypt.h>
 #endif
@@ -38,10 +40,12 @@
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#if APR_HAVE_IO_H
+#include <io.h>
+#endif
 
-#ifdef WIN32
-#include <conio.h>
-#define unlink _unlink
+#ifdef _MSC_VER
+#define write _write
 #endif
 
 apr_file_t *errfile;
diff --git a/support/passwd_common.h b/support/passwd_common.h
index 00680624ce..01d5652024 100644
--- a/support/passwd_common.h
+++ b/support/passwd_common.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef _PASSWD_COMMON_H
+#define _PASSWD_COMMON_H
+
 #include "apr.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
@@ -115,3 +118,6 @@ int get_password(struct passwd_ctx *ctx);
  * Make a password record from the given information.
  */
 int mkhash(struct passwd_ctx *ctx);
+
+#endif /* _PASSWD_COMMON_H */
+