From 6e90803f901b18750c9bbed5f0321fd9e82a88ff Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Mon, 6 Jan 2003 09:58:36 +0000
Subject: [PATCH] Fix for systems that don't have INET_ADDRSTRLEN.
---
src/backend/libpq/auth.c | 3 ++-
src/backend/libpq/pqcomm.c | 3 +--
src/backend/postmaster/postmaster.c | 3 +--
src/include/libpq/pqcomm.h | 11 ++++++++++-
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 247b80ba25e..2ee4a689ae8 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.95 2003/01/06 03:18:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.96 2003/01/06 09:58:23 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,6 +30,7 @@
#include "libpq/hba.h"
#include "libpq/libpq.h"
#include "libpq/password.h"
+#include "libpq/pqcomm.h"
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "storage/ipc.h"
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 904afb3b8fd..af5b4af3e4c 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -29,7 +29,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.c,v 1.144 2003/01/06 03:18:26 momjian Exp $
+ * $Id: pqcomm.c,v 1.145 2003/01/06 09:58:23 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -69,7 +69,6 @@
#include <sys/stat.h>
#include <sys/socket.h>
#include <netdb.h>
-#include <netinet/in.h>
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index e237d00ca7f..77436002c9d 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.302 2003/01/06 03:18:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.303 2003/01/06 09:58:36 petere Exp $
*
* NOTES
*
@@ -72,7 +72,6 @@
#include <fcntl.h>
#include <time.h>
#include <sys/param.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <limits.h>
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 32bd1873ec1..7c476699f06 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.h,v 1.74 2003/01/06 05:33:45 momjian Exp $
+ * $Id: pqcomm.h,v 1.75 2003/01/06 09:58:36 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,6 +34,15 @@
#endif /* not WIN32 */
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
+#ifndef INET6_ADDRSTRLEN
+#define INET6_ADDRSTRLEN 46
+#endif
+
+
#ifndef HAVE_STRUCT_SOCKADDR_UN
struct sockaddr_un
{
--
GitLab