trawick 00/12/22 08:55:04
Modified: . configure.in
i18n/unix xlate.c
include apr.h.in apr.hw
include/arch/unix fileio.h
misc/unix getuuid.c
passwd apr_getpass.c
strings apr_strings.c
tables apr_tables.c
src/buckets ap_buckets.c ap_buckets_heap.c
src/hooks ap_hooks.c
Log:
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.
Submitted by: Dale Ghent <[EMAIL PROTECTED]>
Reviewed by: Jeff Trawick
Revision Changes Path
1.195 +2 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- configure.in 2000/12/22 00:02:50 1.194
+++ configure.in 2000/12/22 16:54:47 1.195
@@ -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)
1.16 +1 -1 apr/i18n/unix/xlate.c
Index: xlate.c
===================================================================
RCS file: /home/cvs/apr/i18n/unix/xlate.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xlate.c 2000/12/21 14:51:22 1.15
+++ xlate.c 2000/12/22 16:54:48 1.16
@@ -67,7 +67,7 @@
#ifdef HAVE_STDDEF_H
#include <stddef.h> /* for NULL */
#endif
-#ifdef HAVE_STRINGS_H
+#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
#ifdef HAVE_LANGINFO_H
1.60 +1 -0 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- apr.h.in 2000/12/22 00:02:50 1.59
+++ apr.h.in 2000/12/22 16:54:50 1.60
@@ -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@
1.45 +1 -0 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- apr.hw 2000/12/22 00:02:51 1.44
+++ apr.hw 2000/12/22 16:54:50 1.45
@@ -129,6 +129,7 @@
#define APR_HAVE_STDIO_H 1
#define APR_HAVE_STDLIB_H 1
#define APR_HAVE_STRING_H 1
+#define APR_HAVE_STRINGS_H 0
#define APR_HAVE_SYS_SIGNAL_H 0
#define APR_HAVE_SYS_SOCKET_H 0
#define APR_HAVE_SYS_TYPES_H 1
1.28 +1 -1 apr/include/arch/unix/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/fileio.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fileio.h 2000/10/23 17:21:11 1.27
+++ fileio.h 2000/12/22 16:54:51 1.28
@@ -76,7 +76,7 @@
#if HAVE_STRING_H
#include <string.h>
#endif
-#if HAVE_STRINGS_H
+#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
#if APR_HAVE_DIRENT_H
1.6 +1 -1 apr/misc/unix/getuuid.c
Index: getuuid.c
===================================================================
RCS file: /home/cvs/apr/misc/unix/getuuid.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- getuuid.c 2000/12/21 14:51:26 1.5
+++ getuuid.c 2000/12/22 16:54:52 1.6
@@ -66,7 +66,7 @@
#include "apr_uuid.h"
#include "apr_md5.h"
#include "apr_general.h"
-#ifdef HAVE_STRINGS_H
+#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
#ifdef HAVE_NETDB_H
1.8 +1 -1 apr/passwd/apr_getpass.c
Index: apr_getpass.c
===================================================================
RCS file: /home/cvs/apr/passwd/apr_getpass.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_getpass.c 2000/12/21 14:51:33 1.7
+++ apr_getpass.c 2000/12/22 16:54:54 1.8
@@ -73,7 +73,7 @@
#if HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_STRINGS_H
+#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
1.6 +1 -1 apr/strings/apr_strings.c
Index: apr_strings.c
===================================================================
RCS file: /home/cvs/apr/strings/apr_strings.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_strings.c 2000/12/21 14:51:34 1.5
+++ apr_strings.c 2000/12/22 16:54:55 1.6
@@ -59,7 +59,7 @@
#ifdef HAVE_STDDEF_H
#include <stddef.h> /* NULL */
#endif
-#ifdef HAVE_STRINGS_H
+#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
1.9 +1 -1 apr/tables/apr_tables.c
Index: apr_tables.c
===================================================================
RCS file: /home/cvs/apr/tables/apr_tables.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_tables.c 2000/11/09 07:12:39 1.8
+++ apr_tables.c 2000/12/22 16:54:57 1.9
@@ -75,7 +75,7 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_STRINGS_H
+#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
1.39 +3 -0 apr-util/src/buckets/ap_buckets.c
Index: ap_buckets.c
===================================================================
RCS file: /home/cvs/apr-util/src/buckets/ap_buckets.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ap_buckets.c 2000/12/21 18:06:14 1.38
+++ ap_buckets.c 2000/12/22 16:54:58 1.39
@@ -59,6 +59,9 @@
#include "apr_errno.h"
#include <stdlib.h>
+#if APR_HAVE_STRINGS_H
+#include <strings.h>
+#endif
#if APR_HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
1.21 +3 -0 apr-util/src/buckets/ap_buckets_heap.c
Index: ap_buckets_heap.c
===================================================================
RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_heap.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ap_buckets_heap.c 2000/12/21 18:06:15 1.20
+++ ap_buckets_heap.c 2000/12/22 16:54:58 1.21
@@ -54,6 +54,9 @@
#include "ap_buckets.h"
#include <stdlib.h>
+#if APR_HAVE_STRINGS_H
+#include <strings.h>
+#endif
/*
* The size of heap bucket memory allocations.
1.25 +3 -0 apr-util/src/hooks/ap_hooks.c
Index: ap_hooks.c
===================================================================
RCS file: /home/cvs/apr-util/src/hooks/ap_hooks.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ap_hooks.c 2000/12/21 18:06:18 1.24
+++ ap_hooks.c 2000/12/22 16:54:59 1.25
@@ -61,6 +61,9 @@
#include "apr.h"
#include "ap_hooks.h"
+#if APR_HAVE_STRINGS_H
+#include <strings.h>
+#endif
#if 0
#define apr_palloc(pool,size) malloc(size)
