--- src/backend/access/gist/gistutil.c.orig Thu Jun 22 20:46:55 2006 +++ src/backend/access/gist/gistutil.c Thu Jun 22 20:47:22 2006 @@ -228,6 +228,12 @@ /* * makes union of two key */ + +#ifdef _MSC_VER +#undef GEVHDRSZ +#define GEVHDRSZ (offsetof(GistEntryVector, vector)) +#endif + static void gistMakeUnionKey( GISTSTATE *giststate, int attno, GISTENTRY *entry1, bool isnull1, --- src/backend/utils/adt/geo_ops.c.orig Mon Mar 6 00:58:42 2006 +++ src/backend/utils/adt/geo_ops.c Thu Jun 22 20:48:01 2006 @@ -2549,6 +2549,11 @@ PG_RETURN_FLOAT8(result); } +#ifdef _MSC_VER +#undef near +#define near _msv_near +#endif /* _MSC_VER */ + Datum dist_pb(PG_FUNCTION_ARGS) { --- src/include/getaddrinfo.h.orig Thu Jun 8 07:24:45 2006 +++ src/include/getaddrinfo.h Thu Jun 22 20:53:44 2006 @@ -41,7 +41,9 @@ #define EAI_SYSTEM (-11) #else /* WIN32 */ #ifdef WIN32_ONLY_COMPILER +#ifndef WSA_NOT_ENOUGH_MEMORY #define WSA_NOT_ENOUGH_MEMORY (WSAENOBUFS) +#endif #define WSATYPE_NOT_FOUND (WSABASEERR+109) #endif #define EAI_AGAIN WSATRY_AGAIN --- src/include/port/win32.h.orig Thu Jun 8 07:24:45 2006 +++ src/include/port/win32.h Thu Jun 22 20:55:06 2006 @@ -1,4 +1,6 @@ /* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.52 2006/06/07 22:24:45 momjian Exp $ */ +#ifndef PORT_WIN32_H +#define PORT_WIN32_H /* undefine and redefine after #include */ #undef mkdir @@ -284,3 +286,5 @@ /* Pulled from Makefile.port in mingw */ #define DLSUFFIX ".dll" #endif + +#endif /* PORT_WIN32_H */ --- src/include/pg_config.h.win32.orig Thu Jun 22 21:35:19 2006 +++ src/include/pg_config.h.win32 Thu Jun 22 21:51:01 2006 @@ -1,661 +1,201 @@ -/* src/include/pg_config.h. Generated by configure. */ -/* src/include/pg_config.h.in. Generated from configure.in by autoheader. */ - -/* This file is generated from MingW ./configure, and with the following - * changes to be valid for Visual C++ (and compatible): - * - * HAVE_CBRT, HAVE_FUNCNAME_FUNC, HAVE_FUNCNAME_FUNCTION, HAVE_GETOPT, - * HAVE_GETOPT_H, HAVE_GETOPT_LONG, HAVE_RINT, HAVE_STRINGS_H, - * HAVE_STRTOLL, HAVE_STRTOULL, HAVE_STRUCT_OPTION, ENABLE_THREAD_SAFETY - * - * For now, also HAVE_IPV6 - */ - -/* Define to the type of arg 1 of 'accept' */ -#define ACCEPT_TYPE_ARG1 unsigned int - -/* Define to the type of arg 2 of 'accept' */ -#define ACCEPT_TYPE_ARG2 struct sockaddr * - -/* Define to the type of arg 3 of 'accept' */ -#define ACCEPT_TYPE_ARG3 int - -/* Define to the return type of 'accept' */ -#define ACCEPT_TYPE_RETURN unsigned int PASCAL - -/* The alignment requirement of a `double'. */ -#define ALIGNOF_DOUBLE 8 - -/* The alignment requirement of a `int'. */ -#define ALIGNOF_INT 4 - -/* The alignment requirement of a `long'. */ -#define ALIGNOF_LONG 4 - -/* The alignment requirement of a `long long int'. */ -#define ALIGNOF_LONG_LONG_INT 8 - -/* The alignment requirement of a `short'. */ -#define ALIGNOF_SHORT 2 - -/* Define to the default TCP port number on which the server listens and to - which clients will try to connect. This can be overridden at run-time, but - it's convenient if your clients have the right default compiled in. - (--with-pgport=PORTNUM) */ -#define DEF_PGPORT 5432 - -/* Define to the default TCP port number as a string constant. */ -#define DEF_PGPORT_STR "5432" - -/* Define to 1 if you want National Language Support. (--enable-nls) */ -/* #undef ENABLE_NLS */ - -/* Define to 1 to build client libraries as thread-safe code. - (--enable-thread-safety) */ -#define ENABLE_THREAD_SAFETY 1 - -/* Define to 1 if getpwuid_r() takes a 5th argument. */ -/* #undef GETPWUID_R_5ARG */ - -/* Define to 1 if gettimeofday() takes only 1 argument. */ -/* #undef GETTIMEOFDAY_1ARG */ - -#ifdef GETTIMEOFDAY_1ARG -# define gettimeofday(a,b) gettimeofday(a) -#endif - -/* Define to 1 if you have the `atexit' function. */ -#define HAVE_ATEXIT 1 - -/* Define to 1 if you have the `cbrt' function. */ -//#define HAVE_CBRT 1 - -/* Define to 1 if you have the `class' function. */ -/* #undef HAVE_CLASS */ - -/* Define to 1 if you have the `crypt' function. */ -/* #undef HAVE_CRYPT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_CRYPT_H */ - -/* Define to 1 if you have the declaration of `fdatasync', and to 0 if you - don't. */ -#define HAVE_DECL_FDATASYNC 0 - -/* Define to 1 if you have the declaration of `F_FULLFSYNC', and to 0 if you - don't. */ -#define HAVE_DECL_F_FULLFSYNC 0 - -/* Define to 1 if you have the declaration of `snprintf', and to 0 if you - don't. */ -#define HAVE_DECL_SNPRINTF 1 - -/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you - don't. */ -#define HAVE_DECL_VSNPRINTF 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLD_H */ - -/* Define to 1 if you have the `dlopen' function. */ -/* #undef HAVE_DLOPEN */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_EDITLINE_HISTORY_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_EDITLINE_READLINE_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ENDIAN_H */ - -/* Define to 1 if you have the `fcvt' function. */ -#define HAVE_FCVT 1 - -/* Define to 1 if you have the `fdatasync' function. */ -/* #undef HAVE_FDATASYNC */ - -/* Define to 1 if you have finite(). */ -#define HAVE_FINITE 1 - -/* Define to 1 if you have the `fpclass' function. */ -/* #undef HAVE_FPCLASS */ - -/* Define to 1 if you have the `fp_class' function. */ -/* #undef HAVE_FP_CLASS */ - -/* Define to 1 if you have the `fp_class_d' function. */ -/* #undef HAVE_FP_CLASS_D */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_FP_CLASS_H */ - -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -/* #undef HAVE_FSEEKO */ - -/* Define to 1 if your compiler understands __func__. */ -//#define HAVE_FUNCNAME__FUNC 1 - -/* Define to 1 if your compiler understands __FUNCTION__. */ -#undef HAVE_FUNCNAME__FUNCTION - -/* Define to 1 if you have getaddrinfo(). */ -/* #undef HAVE_GETADDRINFO */ - -/* Define to 1 if you have the `gethostbyname_r' function. */ -/* #undef HAVE_GETHOSTBYNAME_R */ - -/* Define to 1 if you have the `getopt' function. */ -//#define HAVE_GETOPT 1 - -/* Define to 1 if you have the header file. */ -//#define HAVE_GETOPT_H 1 - -/* Define to 1 if you have the `getopt_long' function. */ -//#define HAVE_GETOPT_LONG 1 - -/* Define to 1 if you have the `getpeereid' function. */ -/* #undef HAVE_GETPEEREID */ - -/* Define to 1 if you have the `getpwuid_r' function. */ -/* #undef HAVE_GETPWUID_R */ - -/* Define to 1 if you have the `getrusage' function. */ -/* #undef HAVE_GETRUSAGE */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_HISTORY_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_IEEEFP_H */ - -/* Define to 1 if you have the `inet_aton' function. */ -/* #undef HAVE_INET_ATON */ - -/* Define to 1 if the system has the type `int64'. */ -/* #undef HAVE_INT64 */ - -/* Define to 1 if the system has the type `int8'. */ -/* #undef HAVE_INT8 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the global variable 'int optreset'. */ -#define HAVE_INT_OPTRESET 1 - -/* Define to 1 if you have the global variable 'int timezone'. */ -#define HAVE_INT_TIMEZONE - -/* Define to 1 if you have support for IPv6. */ -//#define HAVE_IPV6 1 - -/* Define to 1 if you have isinf(). */ -#define HAVE_ISINF 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_KERNEL_IMAGE_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_KERNEL_OS_H */ - -/* Define to 1 if `e_data' is member of `krb5_error'. */ -/* #undef HAVE_KRB5_ERROR_E_DATA */ - -/* Define to 1 if `text.data' is member of `krb5_error'. */ -/* #undef HAVE_KRB5_ERROR_TEXT_DATA */ - -/* Define to 1 if `client' is member of `krb5_ticket'. */ -/* #undef HAVE_KRB5_TICKET_CLIENT */ - -/* Define to 1 if `enc_part2' is member of `krb5_ticket'. */ -/* #undef HAVE_KRB5_TICKET_ENC_PART2 */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LANGINFO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LDAP_H */ - -/* Define to 1 if you have the `crypto' library (-lcrypto). */ -/* #undef HAVE_LIBCRYPTO */ - -/* Define to 1 if you have the `eay32' library (-leay32). */ -/* #undef HAVE_LIBEAY32 */ - -/* Define to 1 if you have the `ldap' library (-lldap). */ -/* #undef HAVE_LIBLDAP */ - -/* Define to 1 if you have the `pam' library (-lpam). */ -/* #undef HAVE_LIBPAM */ - -/* Define if you have a function readline library */ -/* #undef HAVE_LIBREADLINE */ - -/* Define to 1 if you have the `ssl' library (-lssl). */ -/* #undef HAVE_LIBSSL */ - -/* Define to 1 if you have the `ssleay32' library (-lssleay32). */ -/* #undef HAVE_LIBSSLEAY32 */ - -/* Define to 1 if you have the `wldap32' library (-lwldap32). */ -/* #undef HAVE_LIBWLDAP32 */ - -/* Define to 1 if you have the `z' library (-lz). */ -/* #undef HAVE_LIBZ */ - -/* Define to 1 if constants of type 'long long int' should have the suffix LL. - */ -#define HAVE_LL_CONSTANTS 1 - -/* Define to 1 if `long int' works and is 64 bits. */ -/* #undef HAVE_LONG_INT_64 */ - -/* Define to 1 if `long long int' works and is 64 bits. */ -#define HAVE_LONG_LONG_INT_64 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_NETINET_IN_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NETINET_TCP_H */ - -/* Define to 1 if you have the `on_exit' function. */ -/* #undef HAVE_ON_EXIT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PAM_PAM_APPL_H */ - -/* Define to 1 if you have the `poll' function. */ -/* #undef HAVE_POLL */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_POLL_H */ - -/* Define to 1 if you have the POSIX signal interface. */ -/* #undef HAVE_POSIX_SIGNALS */ - -/* Define to 1 if you have the `pstat' function. */ -/* #undef HAVE_PSTAT */ - -/* Define to 1 if the PS_STRINGS thing exists. */ -/* #undef HAVE_PS_STRINGS */ - -/* Define if you have POSIX threads libraries and header files. */ -/* #undef HAVE_PTHREAD */ - -/* Define to 1 if you have the header file. */ -#define HAVE_PWD_H 1 - -/* Define to 1 if you have the `random' function. */ -/* #undef HAVE_RANDOM */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_READLINE_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_READLINE_HISTORY_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_READLINE_READLINE_H */ - -/* Define to 1 if you have the `readlink' function. */ -/* #undef HAVE_READLINK */ - -/* Define to 1 if you have the `replace_history_entry' function. */ -/* #undef HAVE_REPLACE_HISTORY_ENTRY */ - -/* Define to 1 if you have the `rint' function. */ -/*#define HAVE_RINT 1*/ - -/* Define to 1 if you have the global variable - 'rl_completion_append_character'. */ -/* #undef HAVE_RL_COMPLETION_APPEND_CHARACTER */ - -/* Define to 1 if you have the `rl_completion_matches' function. */ -/* #undef HAVE_RL_COMPLETION_MATCHES */ - -/* Define to 1 if you have the `rl_filename_completion_function' function. */ -/* #undef HAVE_RL_FILENAME_COMPLETION_FUNCTION */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SECURITY_PAM_APPL_H */ - -/* Define to 1 if you have the `setproctitle' function. */ -/* #undef HAVE_SETPROCTITLE */ - -/* Define to 1 if you have the `setsid' function. */ -/* #undef HAVE_SETSID */ - -/* Define to 1 if you have the `sigprocmask' function. */ -/* #undef HAVE_SIGPROCMASK */ - -/* Define to 1 if you have sigsetjmp(). */ -/* #undef HAVE_SIGSETJMP */ - -/* Define to 1 if the system has the type `sig_atomic_t'. */ -#define HAVE_SIG_ATOMIC_T 1 - -/* Define to 1 if you have the `snprintf' function. */ -/* #undef HAVE_SNPRINTF */ - -/* Define to 1 if you have spinlocks. */ -#define HAVE_SPINLOCKS 1 - -/* Define to 1 if you have the `srandom' function. */ -/* #undef HAVE_SRANDOM */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the `strerror_r' function. */ -/* #undef HAVE_STRERROR_R */ - -/* Define to 1 if cpp supports the ANSI # stringizing operator. */ -#define HAVE_STRINGIZE 1 - -/* Define to 1 if you have the header file. */ -/*#define HAVE_STRINGS_H 1 */ - -/* Define to 1 if you have the header file. */ - -/*#define HAVE_STRING_H 1 */ - -/* Define to 1 if you have the `strtol' function. */ -#define HAVE_STRTOL 1 - -/* Define to 1 if you have the `strtoll' function. */ -//#define HAVE_STRTOLL 1 - -/* Define to 1 if you have the `strtoq' function. */ -/* #undef HAVE_STRTOQ */ - -/* Define to 1 if you have the `strtoul' function. */ -#define HAVE_STRTOUL 1 - -/* Define to 1 if you have the `strtoull' function. */ -//#define HAVE_STRTOULL 1 - -/* Define to 1 if you have the `strtouq' function. */ -/* #undef HAVE_STRTOUQ */ - -/* Define to 1 if the system has the type `struct addrinfo'. */ -#define HAVE_STRUCT_ADDRINFO 1 - -/* Define to 1 if the system has the type `struct cmsgcred'. */ -/* #undef HAVE_STRUCT_CMSGCRED */ - -/* Define to 1 if the system has the type `struct fcred'. */ -/* #undef HAVE_STRUCT_FCRED */ - -/* Define to 1 if the system has the type `struct option'. */ -//#define HAVE_STRUCT_OPTION 1 - -/* Define to 1 if `sa_len' is member of `struct sockaddr'. */ -/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */ - -/* Define to 1 if the system has the type `struct sockaddr_storage'. */ -#define HAVE_STRUCT_SOCKADDR_STORAGE 1 - -/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */ -#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 - -/* Define to 1 if `ss_len' is member of `struct sockaddr_storage'. */ -/* #undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN */ - -/* Define to 1 if `__ss_family' is member of `struct sockaddr_storage'. */ -/* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */ - -/* Define to 1 if `__ss_len' is member of `struct sockaddr_storage'. */ -/* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN */ - -/* Define to 1 if the system has the type `struct sockaddr_un'. */ -/* #undef HAVE_STRUCT_SOCKADDR_UN */ - -/* Define to 1 if the system has the type `struct sockcred'. */ -/* #undef HAVE_STRUCT_SOCKCRED */ - -/* Define to 1 if `tm_zone' is member of `struct tm'. */ -/* #undef HAVE_STRUCT_TM_TM_ZONE */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SUPPORTDEFS_H */ - -/* Define to 1 if you have the `symlink' function. */ -#define HAVE_SYMLINK 1 - -/* Define to 1 if you have the `sysconf' function. */ -/* #undef HAVE_SYSCONF */ - -/* Define to 1 if you have the syslog interface. */ -/* #undef HAVE_SYSLOG */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IPC_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_POLL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PSTAT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SELECT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SEM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SHM_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_UN_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_TERMIOS_H */ - -/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use - `HAVE_STRUCT_TM_TM_ZONE' instead. */ -/* #undef HAVE_TM_ZONE */ - -/* Define to 1 if you have the `towlower' function. */ -#define HAVE_TOWLOWER 1 - -/* Define to 1 if you have the external array `tzname'. */ -/* #undef HAVE_TZNAME */ - -/* Define to 1 if the system has the type `uint64'. */ -/* #undef HAVE_UINT64 */ - -/* Define to 1 if the system has the type `uint8'. */ -/* #undef HAVE_UINT8 */ - -/* Define to 1 if the system has the type `union semun'. */ -/* #undef HAVE_UNION_SEMUN */ - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have unix sockets. */ -/* #undef HAVE_UNIX_SOCKETS */ - -/* Define to 1 if you have the `unsetenv' function. */ -/* #undef HAVE_UNSETENV */ - -/* Define to 1 if you have the `utime' function. */ -#define HAVE_UTIME 1 - -/* Define to 1 if you have the `utimes' function. */ -/* #undef HAVE_UTIMES */ - -/* Define to 1 if you have the header file. */ -#define HAVE_UTIME_H 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -/* #undef HAVE_VSNPRINTF */ - -/* Define to 1 if you have the `waitpid' function. */ -/* #undef HAVE_WAITPID */ - -/* Define to 1 if you have the header file. */ -#define HAVE_WCHAR_H 1 - -/* Define to 1 if you have the `wcstombs' function. */ -#define HAVE_WCSTOMBS 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WCTYPE_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_WINLDAP_H */ - -/* Define to the appropriate snprintf format for 64-bit ints, if any. */ -#define INT64_FORMAT "%lld" - -/* Define to build with Kerberos 5 support. (--with-krb5) */ -/* #undef KRB5 */ - -/* Define to the location of locale files. */ -/* #undef LOCALEDIR */ - -/* Define as the maximum alignment requirement of any C data type. */ -#define MAXIMUM_ALIGNOF 8 - -/* Define bytes to use libc memset(). */ -#define MEMSET_LOOP_LIMIT 1024 - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "pgsql-bugs@postgresql.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "PostgreSQL" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 8.2devel" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "postgresql" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "8.2devel" - -/* Define to the name of the default PostgreSQL service principal in Kerberos. - (--with-krb-srvnam=NAME) */ -#define PG_KRB_SRVNAM "postgres" - -/* PostgreSQL version as a string */ -#define PG_VERSION "8.2devel" - -/* PostgreSQL version as a number */ -#define PG_VERSION_NUM 80200 - -/* A string containing the version number, platform, and C compiler */ -#define PG_VERSION_STR "Uninitialized version string (win32)" - -/* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* The size of a `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T 4 - -/* The size of a `unsigned long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG 4 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if strerror_r() returns a int. */ -/* #undef STRERROR_R_INT */ - -/* Define to 1 if your declares `struct tm'. */ -/* #undef TM_IN_SYS_TIME */ - -/* Define to the appropriate snprintf format for unsigned 64-bit ints, if any. - */ -#define UINT64_FORMAT "%llu" - -/* Define to 1 to build with assertion checks. (--enable-cassert) */ -/* #undef USE_ASSERT_CHECKING */ - -/* Define to 1 to build with Bonjour support. (--with-bonjour) */ -/* #undef USE_BONJOUR */ - -/* Define to 1 if you want 64-bit integer timestamp and interval support. - (--enable-integer-datetimes) */ -/* #undef USE_INTEGER_DATETIMES */ - -/* Define to 1 to build with LDAP support. (--with-ldap) */ -/* #undef USE_LDAP */ - -/* Define to select named POSIX semaphores. */ -/* #undef USE_NAMED_POSIX_SEMAPHORES */ - -/* Define to 1 to build with PAM support. (--with-pam) */ -/* #undef USE_PAM */ - -/* Use replacement snprintf() functions. */ -#define USE_REPL_SNPRINTF 1 - -/* Define to build with (Open)SSL support. (--with-openssl) */ -/* #undef USE_SSL */ - -/* Define to select SysV-style semaphores. */ -#define USE_SYSV_SEMAPHORES 1 - -/* Define to select SysV-style shared memory. */ -#define USE_SYSV_SHARED_MEMORY 1 - -/* Define to select unnamed POSIX semaphores. */ -/* #undef USE_UNNAMED_POSIX_SEMAPHORES */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -/* #undef _LARGEFILE_SOURCE */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -/* #undef inline */ - -/* Define to empty if the C compiler does not understand signed types. */ -/* #undef signed */ - -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ -/* #undef volatile */ +/* src/include/pg_config.h. Generated by configure. */ +/* src/include/pg_config.h.in. Generated from configure.in by autoheader. */ + +#define ACCEPT_TYPE_ARG1 int +#define ACCEPT_TYPE_ARG2 struct sockaddr * +#define ACCEPT_TYPE_ARG3 int +#define ACCEPT_TYPE_RETURN int +#define ALIGNOF_DOUBLE 4 +#define ALIGNOF_INT 4 +#define ALIGNOF_LONG 4 +#define ALIGNOF_LONG_LONG_INT 4 +#define ALIGNOF_SHORT 2 +#define DEF_PGPORT 5432 +#define DEF_PGPORT_STR "5432" +#ifdef GETTIMEOFDAY_1ARG +# define gettimeofday(a,b) gettimeofday(a) +#endif +#define HAVE_DLOPEN 1 +#define HAVE_FCVT 1 +#ifdef WIN32 +# define fcvt _fcvt +#endif +#define HAVE_FINITE 1 +#define HAVE_GETOPT 1 +#define HAVE_INET_ATON 1 +#define HAVE_INT64 1 +typedef __int64 int64; +#define HAVE_INT_OPTRESET 1 +#define HAVE_ISINF 1 +#define HAVE_LIBM 1 +#define HAVE_MEMMOVE 1 +#define HAVE_SETSID 1 + +#define HAVE_SPINLOCKS 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRCASECMP 1 +#define HAVE_STRDUP 1 +#define HAVE_STRERROR 1 +#define HAVE_STRINGIZE 1 +#define HAVE_STRING_H 1 +#define HAVE_STRTOL 1 +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the `strtoull' function. */ +/* #undef HAVE_STRTOULL */ + +#define HAVE_SYS_SOCKET_H 1 +#define HAVE_IPV6 1 + +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TYPES_H 1 + +#define HAVE_UINT64 1 +typedef unsigned __int64 uint64; + +#define HAVE_UNION_SEMUN 1 +#define HAVE_UNISTD_H 1 + +#define HAVE_DECL_SNPRINTF 1 +#define HAVE_DECL_VSNPRINTF 1 +//#define HAVE_SNPRINTF 1 +//#define HAVE_VSNPRINTF 1 + +#define INT64_FORMAT "%I64d" +#define UINT64_FORMAT "%I64u" + +#define MAXIMUM_ALIGNOF 4 + +#define PACKAGE_BUGREPORT "pgsql-bugs@postgresql.org" +#define PACKAGE_NAME "PostgreSQL" +#define PACKAGE_STRING "PostgreSQL 8.2devel" +#define PACKAGE_TARNAME "postgresql" +#define PACKAGE_VERSION "8.2devel" +#define PG_KRB_SRVNAM "postgres" +#define PG_VERSION "8.2devel" +#define PG_VERSION_STR "PostgreSQL 8.2devel on Windows, compiled by Microsoft C/C++ Version 12.00.8804" +#define PG_VERSION_NUM 80200 + +#define SIZEOF_UNSIGNED_LONG 4 +#define STDC_HEADERS 1 +//#define USE_SYSV_SEMAPHORES 1 +#define USE_SYSV_SHARED_MEMORY 1 +#define USE_WIN32_SEMAPHORES 1 + +#define MEMSET_LOOP_LIMIT 1024 + +#ifndef JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION +#define JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION 0x00000400 +#endif + +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x500 +#endif + +#ifndef FRONTEND +#define EXEC_BACKEND 1 +#else +#define HAVE_ATEXIT 1 +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * include files do not exist. + * +*/ +#pragma warning( disable : 4018 4761 4244 4146 ) +#pragma include_alias( , ) + +#ifndef WIN32_CLIENT_ONLY +#pragma include_alias( "pg_config_paths.h", "postgres.h" ) +#define PGBINDIR "/usr/local/pgsql/bin" +#define PGSHAREDIR "/usr/local/pgsql/share" +#define SYSCONFDIR "/usr/local/pgsql/etc" +#define INCLUDEDIR "/usr/local/pgsql/include" +#define PKGINCLUDEDIR "/usr/local/pgsql/include" +#define INCLUDEDIRSERVER "/usr/local/pgsql/include/server" +#define LIBDIR "/usr/local/pgsql/lib" +#define PKGLIBDIR "/usr/local/pgsql/lib" +#define LOCALEDIR "" +#define DOCDIR "/usr/local/pgsql/doc" +#define MANDIR "/usr/local/pgsql/man" + +#define HAS_TEST_AND_SET +#define TAS(lock) (!InterlockedExchange((long*)lock, 1)) +#endif + +extern int getopt(int nargc, char *const * nargv, const char *ostr); +extern int inet_aton(const char *cp, struct in_addr * addr); + +/* + * strcasecmp() is not in Windows, stricmp is, though + */ +#define strcasecmp(a,b) stricmp(a,b) +#define strncasecmp(a,b,c) _strnicmp(a,b,c) +/* + * Some compat functions + */ +#define chdir(a) _chdir(a) +#define mkdir(a,b) _mkdir(a) +#define rmdir(a) _rmdir(a) +#define vsnprintf(a,b,c,d) _vsnprintf(a,b,c,d) +#define snprintf _snprintf +#define isnan(a) _isnan(a) +#define isatty(a) _isatty(a) +#define strdup _strdup +#define isinf(x) ((_fpclass(x) == _FPCLASS_PINF) || (_fpclass(x) == _FPCLASS_NINF)) +#define finite(x) _finite(x) + +#define DLSUFFIX ".dll" +#define MAXPGPATH 1024 + +#undef ERROR + +#ifndef BUILDING_DLL +#undef EINTR +#endif + +#undef small +#define pg_small + +#ifndef NDEBUG +#undef assert +#endif + +#ifndef INVALID_FILE_ATTRIBUTES +#define INVALID_FILE_ATTRIBUTES ((DWORD)-1) +#endif + +#ifndef FRONTEND +typedef long ssize_t; +#endif +typedef int slock_t; +typedef unsigned short mode_t; + +#define inline __inline +#define __inline__ __inline + +#define _S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC) +#define _S_IXUSR _S_IEXEC +#define _S_IWUSR _S_IWRITE +#define _S_IRUSR _S_IREAD +#define S_IRUSR _S_IRUSR +#define S_IWUSR _S_IWUSR +#define S_IXUSR _S_IXUSR + +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) + +#define F_OK 0 +#define W_OK 2 +#define R_OK 4 +