From 86be8677a91b551448d325a1dbf9dd8c8031615d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 13 Oct 1996 04:50:27 +0000
Subject: [PATCH] Added consistent include file handling for MAXHOSTNAMELEN.
If I have introduced any syntax errors with this, I will patch them in
the morning, and Marc will have a good laugh.
---
src/backend/libpq/auth.c | 7 +++++--
src/backend/postmaster/postmaster.c | 29 ++++++++++-------------------
src/backend/tcop/postgres.c | 10 +++-------
src/bin/pg4_dump/pg4_dump.c | 3 ++-
src/interfaces/libpq/fe-auth.c | 7 +++++--
5 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 8c253f5c39f..3a42c236e03 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.3 1996/10/12 07:47:08 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.4 1996/10/13 04:49:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,7 +52,10 @@
*/
#include <stdio.h>
#include <string.h>
-#include <sys/param.h> /* for MAX{HOSTNAME,PATH}LEN, NOFILE */
+#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
+#ifndef MAXHOSTNAMELEN
+#include <netdb.h> /* for MAXHOSTNAMELEN on some */
+#endif
#include <pwd.h>
#include <ctype.h> /* isspace() declaration */
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 3a2e103c34f..15b0e10b204 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.13 1996/10/13 04:01:05 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.14 1996/10/13 04:49:48 momjian Exp $
*
* NOTES
*
@@ -47,25 +47,16 @@
#include <sys/stat.h> /* for umask */
#include <sys/time.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
-
-#if defined(USES_WINSOCK)
-# include <winsock.h>
-# include <limits.h>
-# define MAXINT INT_MAX
+#ifndef MAXHOSTNAMELEN
+#include <netdb.h> /* for MAXHOSTNAMELEN on some */
+#endif
+#if defined(USE_LIMITS_H)
+# include <machine/limits.h>
+# define MAXINT INT_MAX
#else
-# include <netdb.h> /* for MAXHOSTNAMELEN on some */
-# ifndef MAXHOSTNAMELEN /* for MAXHOSTNAMELEN everywhere else */
-# include <arpa/nameser.h>
-# define MAXHOSTNAMELEN MAXDNAME
-# endif
-# if defined(USE_LIMITS_H)
-# include <machine/limits.h>
-# define MAXINT INT_MAX
-# else
-# include <values.h>
-# endif /* !USE_LIMITS_H */
-# include <sys/wait.h>
-#endif /* USES_WINSOCK */
+# include <values.h>
+#endif /* !USE_LIMITS_H */
+#include <sys/wait.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index dd638c03c72..7ac58d8253a 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.9 1996/10/04 20:16:32 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.10 1996/10/13 04:49:57 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -27,13 +27,9 @@
#include <time.h>
#include <sys/time.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
-#ifndef WIN32
+#ifndef MAXHOSTNAMELEN
#include <netdb.h> /* for MAXHOSTNAMELEN on some */
-#ifndef MAXHOSTNAMELEN /* for MAXHOSTNAMELEN everywhere else */
-#include <arpa/nameser.h>
-#define MAXHOSTNAMELEN MAXDNAME
#endif
-#endif /* WIN32 */
#include <errno.h>
#ifdef PORTNAME_aix
#include <sys/select.h>
@@ -1269,7 +1265,7 @@ PostgresMain(int argc, char *argv[])
*/
if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.9 $ $Date: 1996/10/04 20:16:32 $");
+ puts("$Revision: 1.10 $ $Date: 1996/10/13 04:49:57 $");
}
/* ----------------
diff --git a/src/bin/pg4_dump/pg4_dump.c b/src/bin/pg4_dump/pg4_dump.c
index 9944ca1190e..6f484d48c64 100644
--- a/src/bin/pg4_dump/pg4_dump.c
+++ b/src/bin/pg4_dump/pg4_dump.c
@@ -28,9 +28,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
-#if defined(PORTNAME_sparc_solaris) || defined(PORTNAME_i386_solaris)
+#ifndef MAXHOSTNAMELEN
#include <netdb.h> /* for MAXHOSTNAMELEN on some */
#endif
+#endif
#include "tmp/postgres.h"
#include "tmp/libpq-fe.h"
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 88350b84b48..18a5a6f08fe 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.4 1996/08/06 16:16:42 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.5 1996/10/13 04:50:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,10 @@
*/
#include <stdio.h>
#include <string.h>
-#include <sys/param.h> /* for MAX{HOSTNAME,PATH}LEN, NOFILE */
+#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
+#ifndef MAXHOSTNAMELEN
+#include <netdb.h> /* for MAXHOSTNAMELEN on some */
+#endif
#include <unistd.h>
#include <sys/types.h>
#include <pwd.h>
--
GitLab