diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-12-06 04:37:05 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-12-06 04:37:05 +0000 |
| commit | 38ffbb95d5956e458fa0bd7e473ed25cd020f7be (patch) | |
| tree | 3833b7f7e2eade35856b73e9a94e7895f8b7bcd3 /src/include | |
| parent | 4bfd1ad9e04efcc196052477522e356e8c5194d7 (diff) | |
| download | postgresql-38ffbb95d5956e458fa0bd7e473ed25cd020f7be.tar.gz postgresql-38ffbb95d5956e458fa0bd7e473ed25cd020f7be.zip | |
Back out V6 code, caused postmaster startup failure.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/libpq/libpq.h | 3 | ||||
| -rw-r--r-- | src/include/libpq/pqcomm.h | 3 | ||||
| -rw-r--r-- | src/include/libpq/v6util.h | 17 |
3 files changed, 2 insertions, 21 deletions
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index b0b1041be18..ced71326cea 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.53 2002/12/06 03:46:32 momjian Exp $ + * $Id: libpq.h,v 1.54 2002/12/06 04:37:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,6 @@ #include "lib/stringinfo.h" #include "libpq/libpq-be.h" -#include "libpq/v6util.h" /* ---------------- * PQArgBlock diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index a84978c5705..1375852a0ca 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.71 2002/12/06 03:46:33 momjian Exp $ + * $Id: pqcomm.h,v 1.72 2002/12/06 04:37:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,7 +47,6 @@ typedef union SockAddr { struct sockaddr sa; struct sockaddr_in in; - struct sockaddr_in6 in6; struct sockaddr_un un; } SockAddr; diff --git a/src/include/libpq/v6util.h b/src/include/libpq/v6util.h deleted file mode 100644 index 6e325d17c07..00000000000 --- a/src/include/libpq/v6util.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef V6UTIL_H -#define V6UTIL_H -void freeaddrinfo2(int hint_ai_family, struct addrinfo *ai); -int getaddrinfo2(const char* hostname, const char* servname, - const struct addrinfo* hintp, struct addrinfo **result); -char* SockAddr_ntop(const SockAddr* sa, char* dst, size_t cnt, int v4conv); -int SockAddr_pton(SockAddr* sa, const char* src, size_t cnt); -int isAF_INETx(const SockAddr* sa); -int isAF_INETx2(int family); -int rangeSockAddr(const SockAddr* addr, const SockAddr* netaddr, const SockAddr* netmask); -int rangeSockAddrAF_INET(const SockAddr* addr, const SockAddr* netaddr, - const SockAddr* netmask); -int rangeSockAddrAF_INET6(const SockAddr* addr, const SockAddr* netaddr, - const SockAddr* netmask); -void convSockAddr6to4(const SockAddr* src, SockAddr* dst); - -#endif /* V6UTIL_H */ |