Fix a couple of warnings that were caused by the APR leak problem. These

are gone now.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59498 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 21 insertions, 0 deletions

diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c
index 1b18f096a..1970b000a 100644
--- a/file_io/unix/dir.c
+++ b/file_io/unix/dir.c
@@ -58,6 +58,7 @@
 #include <string.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include "fileio.h"
 #include "apr_file_io.h"
 #include "apr_lib.h"
diff --git a/file_io/unix/filedup.c b/file_io/unix/filedup.c
index 6067564b1..5de013171 100644
--- a/file_io/unix/filedup.c
+++ b/file_io/unix/filedup.c
@@ -58,6 +58,7 @@
 #include "apr_general.h"
 #include "apr_lib.h"
 #include <string.h>
+#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_dupfile(ap_file_t **, ap_file_t *)
diff --git a/file_io/unix/open.c b/file_io/unix/open.c
index 4d17a70ca..be5b2b773 100644
--- a/file_io/unix/open.c
+++ b/file_io/unix/open.c
@@ -61,6 +61,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#include <unistd.h>
 
 ap_status_t file_cleanup(void *thefile)
 {
diff --git a/file_io/unix/seek.c b/file_io/unix/seek.c
index aae8ece94..b2ab863c3 100644
--- a/file_io/unix/seek.c
+++ b/file_io/unix/seek.c
@@ -57,6 +57,7 @@
 #include "apr_file_io.h"
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *)
diff --git a/lib/apr_md5.c b/lib/apr_md5.c
index 2c1b25d47..8f4751567 100644
--- a/lib/apr_md5.c
+++ b/lib/apr_md5.c
@@ -104,6 +104,9 @@
 #include "apr_md5.h"
 #include "apr_lib.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
diff --git a/lib/apr_pools.c b/lib/apr_pools.c
index 25084f1eb..e23f8a0b3 100644
--- a/lib/apr_pools.c
+++ b/lib/apr_pools.c
@@ -85,6 +85,9 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
diff --git a/lib/apr_tables.c b/lib/apr_tables.c
index 9af07c4ff..f832daf9c 100644
--- a/lib/apr_tables.c
+++ b/lib/apr_tables.c
@@ -78,6 +78,9 @@
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 /*****************************************************************
  * This file contains array and ap_table_t functions only.
diff --git a/locks/unix/locks.c b/locks/unix/locks.c
index 862ded2d2..a6ca4b16e 100644
--- a/locks/unix/locks.c
+++ b/locks/unix/locks.c
@@ -59,6 +59,7 @@
 #include "apr_lib.h"
 #include "locks.h"
 #include <string.h>
+#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_create_lock(ap_context_t *, ap_locktype_e, char *, 
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index 25084f1eb..e23f8a0b3 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -85,6 +85,9 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
diff --git a/misc/unix/start.c b/misc/unix/start.c
index 213543437..019a63eeb 100644
--- a/misc/unix/start.c
+++ b/misc/unix/start.c
@@ -217,6 +217,7 @@ ap_status_t ap_set_abort(int (*apr_abort)(int retcode), struct context_t *cont)
     }
     else {
         cont->apr_abort = apr_abort;
+        return APR_SUCCESS;
     }
 }
  
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
index 628bbaa43..3575a204e 100644
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
@@ -61,6 +61,7 @@
 #include "apr_network_io.h"
 #include "apr_lib.h"
 #include <sys/time.h>
+#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_send(ap_socket_t *, const char *, ap_ssize_t *, time_t)
diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c
index 29d0c28ab..f070925a7 100644
--- a/network_io/unix/sockets.c
+++ b/network_io/unix/sockets.c
@@ -60,6 +60,7 @@
 #include "apr_lib.h"
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/tcp.h>
 #include <netinet/in.h>
diff --git a/threadproc/unix/procsup.c b/threadproc/unix/procsup.c
index acbd6d44d..1c2e10456 100644
--- a/threadproc/unix/procsup.c
+++ b/threadproc/unix/procsup.c
@@ -61,6 +61,7 @@
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_lib.h"
+#include <unistd.h>
 
 /* ***APRDOC********************************************************
  * ap_status_t ap_detach(ap_context_t *, ap_proc_t *)