Add configure check to see whether <string.h> and <strings.h> may both be

included, and then include <strings.h> if so.  Several systems already
needed <strings.h> anyway.  Some new systems that claim to conform to the
Unix 9x "standard" do not declare str[n]casemp() in string.h, and C99
compilers will not like that.

5 files changed, 8 insertions, 20 deletions

diff --git a/src/include/c.h b/src/include/c.h
index b38f2b96e1e..4686de0919e 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.84 2000/10/03 03:11:22 momjian Exp $
+ * $Id: c.h,v 1.85 2000/11/03 18:43:52 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,6 +51,9 @@
 #include <string.h>
 #include <stddef.h>
 #include <stdarg.h>
+#ifdef STRING_H_WITH_STRINGS_H
+#include <strings.h>
+#endif
 
 #ifdef __CYGWIN__
 #include <errno.h>
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 66faa7503bb..c3d5b663485 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.145 2000/10/30 07:17:31 ishii Exp $
+ * $Id: config.h.in,v 1.146 2000/11/03 18:43:52 petere Exp $
  */
 
 #ifndef CONFIG_H
@@ -374,6 +374,9 @@
 /* Set to 1 if you have <sys/pstat.h> */
 #undef HAVE_SYS_PSTAT_H
 
+/* Define if string.h and strings.h may both be included */
+#undef STRING_H_WITH_STRINGS_H
+
 /* Define if you have the setproctitle function.  */
 #undef HAVE_SETPROCTITLE
 
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
index 04d3a506d67..b37990c3dd9 100644
--- a/src/include/port/sco.h
+++ b/src/include/port/sco.h
@@ -11,12 +11,6 @@
 
 typedef unsigned char slock_t;
 
-/***************************************************************
- * The following include will get the needed prototype for the
- * strcasecmp() function.
- ***************************************************************/
-#include <strings.h>
-
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
 #endif
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index f51729448d1..09bd50c5d8a 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -11,12 +11,6 @@ typedef unsigned char slock_t;
 
 #define DISABLE_COMPLEX_MACRO
 
-/***************************************************************
- * strcasecmp() is in c89.a. The following include will get the
- * needed prototype.
- ***************************************************************/
-#include <strings.h>
-
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
 #endif
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
index 380a19078f9..76d5f26d88b 100644
--- a/src/include/port/unixware.h
+++ b/src/include/port/unixware.h
@@ -14,12 +14,6 @@ typedef unsigned char slock_t;
 
 #define DISABLE_COMPLEX_MACRO
 
-/***************************************************************
- * The following include will get the needed prototype for the
- * strcasecmp() function.
- ***************************************************************/
-#include <strings.h>
-
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
 #endif