Various fixes for string.h vs strings.h

From: Frank Ridderbusch <ridderbusch.pad@sni.de>

src/backend/libpq/pqcomm.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.37 1998/02/19 14:27:33 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.38 1998/02/24 04:01:53 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,9 +34,14 @@
  *		the postgres backend.
  *
  */
+#include "postgres.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <strings.h>
+#if defined(HAVE_STRING_H)
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 #include <signal.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -56,13 +61,11 @@
 #endif							/* SOMAXCONN */
 #endif							/* linux */
 
-#include <postgres.h>
-
-#include <miscadmin.h>
-#include <libpq/pqsignal.h>
-#include <libpq/auth.h>
-#include <libpq/libpq.h>		/* where the declarations go */
-#include <storage/ipc.h>
+#include "miscadmin.h"
+#include "libpq/pqsignal.h"
+#include "libpq/auth.h"
+#include "libpq/libpq.h"		/* where the declarations go */
+#include "storage/ipc.h"
 
 /* ----------------
  *		declarations

src/bin/pg_passwd/pg_passwd.c

@@ -1,18 +1,21 @@
 /*
  * @(#) pg_passwd.c 1.8 09:13:16 97/07/02		Y. Ichikawa
  */
+#include "postgres.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <strings.h>
+#if defined(HAVE_STRING_H)
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
 #include <ctype.h>
 #define issaltchar(c)	(isalnum(c) || (c) == '.' || (c) == '/')
 
-#include "postgres.h"
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif

src/configure.in

@@ -423,6 +423,7 @@ AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
 AC_CHECK_HEADERS(sys/resource.h netdb.h arpa/inet.h getopt.h)
 AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h endian.h float.h)
 AC_CHECK_HEADERS(readline/history.h ieeefp.h fp_class.h netinet/in.h)
+AC_CHECK_HEADERS(string.h strings.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

src/include/config.h.in

@@ -14,6 +14,12 @@
  * The following is set using configure.  
  */
 
+/* Set to 1 if you have <string.h> */
+#undef HAVE_STRING_H
+
+/* Set to 1 if you have <strings.h> */
+#undef HAVE_STRINGS_H
+
 /* Set to 1 if you have <getopt.h> */
 #undef HAVE_GETOPT_H
 

src/interfaces/ecpg/preproc/ecpg.c

@@ -2,6 +2,8 @@
 /* (C) Michael Meskes <meskes@debian.org> Feb 5th, 1998 */
 /* Placed under the same copyright as PostgresSQL */
 
+#include "postgres.h"
+
 #include <stdio.h>
 #if HAVE_GETOPT_H
 # include <getopt.h>
@@ -9,7 +11,11 @@
 # include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <strings.h>
+#if defined(HAVE_STRING_H)
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 
 #include "extern.h"