These two patches for apr and apr-util fix compile warnings on Solari…

…s 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 git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60987 13f79535-47bb-0310-9956-ffa450edef68
manusfreedom · Dec 22, 2000 · 28adb1a · 28adb1a
1 parent 5804043
commit 28adb1a
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 7 deletions.
diff --git a/configure.in b/configure.in
@@ -277,7 +277,7 @@ AC_CHECK_HEADERS(stddef.h)
 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(stdargh)
 AC_SUBST(stdioh)
 AC_SUBST(stdlibh)
 AC_SUBST(stringh)
+AC_SUBST(stringsh)
 AC_SUBST(sys_signalh)
 AC_SUBST(sys_socketh)
 AC_SUBST(sys_typesh)

diff --git a/i18n/unix/xlate.c b/i18n/unix/xlate.c
@@ -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

diff --git a/include/apr.h.in b/include/apr.h.in
@@ -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@

diff --git a/include/apr.hw b/include/apr.hw
@@ -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

diff --git a/include/arch/unix/fileio.h b/include/arch/unix/fileio.h
@@ -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

diff --git a/misc/unix/getuuid.c b/misc/unix/getuuid.c
@@ -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

diff --git a/passwd/apr_getpass.c b/passwd/apr_getpass.c
@@ -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
 

diff --git a/strings/apr_strings.c b/strings/apr_strings.c
@@ -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
 

diff --git a/tables/apr_tables.c b/tables/apr_tables.c
@@ -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