diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
-rw-r--r-- | src/include/port/pg_iovec.h | 20 | ||||
-rw-r--r-- | src/tools/msvc/Solution.pm | 1 |
3 files changed, 8 insertions, 16 deletions
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index fc5ad5fd658..ed6185343e2 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -538,9 +538,6 @@ /* Define to 1 if you have the <sys/ucred.h> header file. */ #undef HAVE_SYS_UCRED_H -/* Define to 1 if you have the <sys/uio.h> header file. */ -#undef HAVE_SYS_UIO_H - /* Define to 1 if you have the <sys/un.h> header file. */ #undef HAVE_SYS_UN_H diff --git a/src/include/port/pg_iovec.h b/src/include/port/pg_iovec.h index f0a50c0e015..ecdddba7fcb 100644 --- a/src/include/port/pg_iovec.h +++ b/src/include/port/pg_iovec.h @@ -13,27 +13,23 @@ #ifndef PG_IOVEC_H #define PG_IOVEC_H -#include <limits.h> +#ifndef WIN32 -#ifdef HAVE_SYS_UIO_H +#include <limits.h> #include <sys/uio.h> -#endif -/* If <sys/uio.h> is missing, define our own POSIX-compatible iovec struct. */ -#ifndef HAVE_SYS_UIO_H +#else + +/* POSIX requires at least 16 as a maximum iovcnt. */ +#define IOV_MAX 16 + +/* Define our own POSIX-compatible iovec struct. */ struct iovec { void *iov_base; size_t iov_len; }; -#endif -/* - * If <limits.h> didn't define IOV_MAX, define our own. POSIX requires at - * least 16. - */ -#ifndef IOV_MAX -#define IOV_MAX 16 #endif /* Define a reasonable maximum that is safe to use on the stack. */ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index cc82668457f..741998a1037 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -375,7 +375,6 @@ sub GenerateFiles HAVE_SYS_STAT_H => 1, HAVE_SYS_TYPES_H => 1, HAVE_SYS_UCRED_H => undef, - HAVE_SYS_UIO_H => undef, HAVE_SYS_UN_H => undef, HAVE_TERMIOS_H => undef, HAVE_TYPEOF => undef, |