These two patches for apr and apr-util fix compile warnings on Solaris for
str* and mem* functions. This fixes all of them. APR_HAVE_STRINGS_H is now
defined in apr.h.

/dale
--- apr/configure.in.orig       Thu Dec 21 20:45:41 2000
+++ apr/configure.in    Thu Dec 21 20:46:53 2000
@@ -277,7 +277,7 @@
 AC_CHECK_HEADERS(stdio.h, stdioh="1", stdioh="0")
 AC_CHECK_HEADERS(stdlib.h, stdlibh="1", stdlibh="0")
 AC_CHECK_HEADERS(string.h, stringh="1", stringh="0")
-AC_CHECK_HEADERS(strings.h)
+AC_CHECK_HEADERS(strings.h, stringsh="1", stringsh="0")
 AC_CHECK_HEADERS(sysapi.h)
 AC_CHECK_HEADERS(sysgtime.h)
 AC_CHECK_HEADERS(termios.h)
@@ -324,6 +324,7 @@
 AC_SUBST(stdioh)
 AC_SUBST(stdlibh)
 AC_SUBST(stringh)
+AC_SUBST(stringsh)
 AC_SUBST(sys_signalh)
 AC_SUBST(sys_socketh)
 AC_SUBST(sys_typesh)

--- apr/include/apr.h.in.orig   Thu Dec 21 20:53:02 2000
+++ apr/include/apr.h.in        Thu Dec 21 20:53:33 2000
@@ -38,6 +38,7 @@
 #define APR_HAVE_STDIO_H        @stdioh@
 #define APR_HAVE_STDLIB_H       @stdlibh@
 #define APR_HAVE_STRING_H       @stringh@
+#define APR_HAVE_STRINGS_H      @stringsh@
 #define APR_HAVE_SYS_SIGNAL_H   @sys_signalh@
 #define APR_HAVE_SYS_SOCKET_H   @sys_socketh@
 #define APR_HAVE_SYS_TYPES_H    @sys_typesh@
--- apr-util/src/hooks/ap_hooks.c.orig  Thu Dec 21 20:28:04 2000
+++ apr-util/src/hooks/ap_hooks.c       Thu Dec 21 21:00:39 2000
@@ -61,6 +61,9 @@
 #include "apr.h"
 #include "ap_hooks.h"
 
+#ifdef APR_HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #if 0
 #define apr_palloc(pool,size)  malloc(size)

--- apr-util/src/buckets/ap_buckets_heap.c.orig Thu Dec 21 21:10:53 2000
+++ apr-util/src/buckets/ap_buckets_heap.c      Thu Dec 21 21:11:41 2000
@@ -54,6 +54,9 @@
 
 #include "ap_buckets.h"
 #include <stdlib.h>
+#ifdef APR_HAVE_STRINGS_H
+#include <strings.h>     
+#endif 
 
 /*
  * The size of heap bucket memory allocations.

--- apr-util/src/buckets/ap_buckets.c.orig      Thu Dec 21 21:10:46 2000
+++ apr-util/src/buckets/ap_buckets.c   Thu Dec 21 21:11:38 2000
@@ -59,6 +59,9 @@
 #include "apr_errno.h"
 
 #include <stdlib.h>
+#ifdef APR_HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #if APR_HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif

Reply via email to