summaryrefslogtreecommitdiff
path: root/file_io
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2001-02-25 20:39:41 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2001-02-25 20:39:41 +0000
commitf89feca4d20956d9232712f1febb5cb10156ba42 (patch)
treea3e2e599ce12612d3dee4b8692c03509a4ca0fa7 /file_io
parent65e1cc33ee39faf300e63315a649d275054a683a (diff)
downloadapr-f89feca4d20956d9232712f1febb5cb10156ba42.tar.gz
Fix the hosed #ifdef APR_HAVE_FOO_H tests, the #if HAVE_ tests, and
also cleanup s/#ifdef HAVE_FOO_H/#if APR_HAVE_FOO_H/ whrere appropriate. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@61303 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
-rw-r--r--file_io/unix/dir.c4
-rw-r--r--file_io/unix/flock.c2
-rw-r--r--file_io/unix/readwrite.c2
-rw-r--r--file_io/win32/dir.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c
index 57fbea0fd..b4ee74f8b 100644
--- a/file_io/unix/dir.c
+++ b/file_io/unix/dir.c
@@ -55,10 +55,10 @@
#include "fileio.h"
#include "apr_strings.h"
#include "apr_portable.h"
-#ifdef HAVE_SYS_SYSLIMITS_H
+#if APR_HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
-#ifdef HAVE_LIMITS_H
+#if APR_HAVE_LIMITS_H
#include <limits.h>
#endif
diff --git a/file_io/unix/flock.c b/file_io/unix/flock.c
index 7765a392a..e656b1baf 100644
--- a/file_io/unix/flock.c
+++ b/file_io/unix/flock.c
@@ -54,7 +54,7 @@
#include "fileio.h"
-#ifdef HAVE_FCNTL_H
+#if APR_HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_SYS_FILE_H
diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c
index 9f4795a73..7de554342 100644
--- a/file_io/unix/readwrite.c
+++ b/file_io/unix/readwrite.c
@@ -281,7 +281,7 @@ apr_status_t apr_file_writev(apr_file_t *thefile, const struct iovec *vec,
apr_size_t nvec, apr_size_t *nbytes)
{
#ifdef HAVE_WRITEV
- int bytes;
+ int bytes;
if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
*nbytes = 0;
diff --git a/file_io/win32/dir.c b/file_io/win32/dir.c
index 514d25f62..0e1e900ed 100644
--- a/file_io/win32/dir.c
+++ b/file_io/win32/dir.c
@@ -62,7 +62,7 @@
#if APR_HAVE_ERRNO_H
#include <errno.h>
#endif
-#ifdef HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
#if APR_HAVE_DIRENT_H