aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/ip.c2
-rw-r--r--src/include/libpq/pqcomm.h13
-rw-r--r--src/include/pg_config.h.in12
-rw-r--r--src/tools/msvc/Solution.pm4
4 files changed, 1 insertions, 30 deletions
diff --git a/src/common/ip.c b/src/common/ip.c
index 0149d07ae7c..9b611cdc8c3 100644
--- a/src/common/ip.c
+++ b/src/common/ip.c
@@ -227,7 +227,7 @@ getaddrinfo_unix(const char *path, const struct addrinfo *hintsp,
* something with it. To suppress the warning, clamp the struct size to
* what will fit in sun_len.
*/
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
unp->sun_len = Min(sizeof(struct sockaddr_un),
((size_t) 1 << (sizeof(unp->sun_len) * BITS_PER_BYTE)) - 1);
#endif
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 7e2f1495f3e..fcf68df39b9 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -21,19 +21,6 @@
#include <netdb.h>
#include <netinet/in.h>
-#ifndef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
-#define ss_family __ss_family
-#else
-#error struct sockaddr_storage does not provide an ss_family member
-#endif
-#endif
-
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN
-#define ss_len __ss_len
-#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN 1
-#endif
-
typedef struct
{
struct sockaddr_storage addr;
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 26eb6a2dfef..109776e465b 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -442,18 +442,6 @@
/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
#undef HAVE_STRUCT_SOCKADDR_SA_LEN
-/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
-#undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
-
-/* Define to 1 if `ss_len' is a member of `struct sockaddr_storage'. */
-#undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
-
-/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
-#undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
-
-/* Define to 1 if `__ss_len' is a member of `struct sockaddr_storage'. */
-#undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN
-
/* Define to 1 if `tm_zone' is a member of `struct tm'. */
#undef HAVE_STRUCT_TM_TM_ZONE
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index fead5c2a72f..a3da3f748a1 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -343,10 +343,6 @@ sub GenerateFiles
HAVE_STRUCT_CMSGCRED => undef,
HAVE_STRUCT_OPTION => undef,
HAVE_STRUCT_SOCKADDR_SA_LEN => undef,
- HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY => 1,
- HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN => undef,
- HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY => undef,
- HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN => undef,
HAVE_STRUCT_TM_TM_ZONE => undef,
HAVE_SYNC_FILE_RANGE => undef,
HAVE_SYNCFS => undef,