diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/be-secure-openssl.c | 2 | ||||
| -rw-r--r-- | src/backend/libpq/be-secure.c | 2 | ||||
| -rw-r--r-- | src/backend/libpq/ifaddr.c | 2 | ||||
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 2 | ||||
| -rw-r--r-- | src/common/ip.c | 2 | ||||
| -rw-r--r-- | src/include/libpq/libpq-be.h | 2 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/include/port/win32/netinet/tcp.h | 7 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-protocol3.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure-openssl.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure.c | 2 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 1 |
13 files changed, 7 insertions, 24 deletions
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 9cec6866a39..55d4b29f7e1 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -24,10 +24,8 @@ #include <unistd.h> #include <netdb.h> #include <netinet/in.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #include <arpa/inet.h> -#endif #include "libpq/libpq.h" #include "miscadmin.h" diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index a05f67afb5e..e3e54713e81 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -24,10 +24,8 @@ #include <sys/socket.h> #include <netdb.h> #include <netinet/in.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #include <arpa/inet.h> -#endif #include "libpq/libpq.h" #include "miscadmin.h" diff --git a/src/backend/libpq/ifaddr.c b/src/backend/libpq/ifaddr.c index 73a8707324f..de35fbba455 100644 --- a/src/backend/libpq/ifaddr.c +++ b/src/backend/libpq/ifaddr.c @@ -24,9 +24,7 @@ #include <sys/socket.h> #include <netdb.h> #include <netinet/in.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> -#endif #include <sys/file.h> #include "libpq/ifaddr.h" diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 3ec4328613b..5dd92c9f668 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -67,9 +67,7 @@ #include <sys/time.h> #include <netdb.h> #include <netinet/in.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> -#endif #include <utime.h> #ifdef _MSC_VER /* mstcpip.h is missing on mingw */ #include <mstcpip.h> diff --git a/src/common/ip.c b/src/common/ip.c index dd9193feb1b..0149d07ae7c 100644 --- a/src/common/ip.c +++ b/src/common/ip.c @@ -28,9 +28,7 @@ #include <sys/socket.h> #include <netdb.h> #include <netinet/in.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> -#endif #include <arpa/inet.h> #include <sys/file.h> diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index fa2fd030095..32d3a4b0853 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -23,9 +23,7 @@ #include <openssl/ssl.h> #include <openssl/err.h> #endif -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> -#endif #ifdef ENABLE_GSS #if defined(HAVE_GSSAPI_H) diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index de8daa2f114..b8fe2201f49 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -322,9 +322,6 @@ /* Define to 1 if you have the `mkdtemp' function. */ #undef HAVE_MKDTEMP -/* Define to 1 if you have the <netinet/tcp.h> header file. */ -#undef HAVE_NETINET_TCP_H - /* Define to 1 if you have the `OPENSSL_init_ssl' function. */ #undef HAVE_OPENSSL_INIT_SSL diff --git a/src/include/port/win32/netinet/tcp.h b/src/include/port/win32/netinet/tcp.h new file mode 100644 index 00000000000..1d377b6adc2 --- /dev/null +++ b/src/include/port/win32/netinet/tcp.h @@ -0,0 +1,7 @@ +/* src/include/port/win32/netinet/tcp.h */ +#ifndef WIN32_NETINET_TCP_H +#define WIN32_NETINET_TCP_H + +#include <sys/socket.h> + +#endif diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 1e057db336a..ec6c17cd0bf 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -51,10 +51,8 @@ #include <sys/socket.h> #include <netdb.h> #include <netinet/in.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif -#endif #ifdef ENABLE_THREAD_SAFETY #ifdef WIN32 diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c index f267dfd33c5..bbfb55542df 100644 --- a/src/interfaces/libpq/fe-protocol3.c +++ b/src/interfaces/libpq/fe-protocol3.c @@ -21,10 +21,8 @@ #include "win32.h" #else #include <unistd.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif -#endif #include "libpq-fe.h" #include "libpq-int.h" diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index 3cc75380e02..3798bb3f11c 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -38,9 +38,7 @@ #include <unistd.h> #include <netdb.h> #include <netinet/in.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> -#endif #include <arpa/inet.h> #endif diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index a1dc7b796d1..3df4a97f2e9 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -29,9 +29,7 @@ #include <unistd.h> #include <netdb.h> #include <netinet/in.h> -#ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> -#endif #include <arpa/inet.h> #endif diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 5ad275b2236..55b30090f6e 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -304,7 +304,6 @@ sub GenerateFiles HAVE_MEMORY_H => 1, HAVE_MEMSET_S => undef, HAVE_MKDTEMP => undef, - HAVE_NETINET_TCP_H => undef, HAVE_OPENSSL_INIT_SSL => undef, HAVE_OSSP_UUID_H => undef, HAVE_PAM_PAM_APPL_H => undef, |