diff options
| -rw-r--r-- | src/bin/pg_config/win32.mak | 2 | ||||
| -rw-r--r-- | src/include/getaddrinfo.h | 6 | ||||
| -rw-r--r-- | src/port/getaddrinfo.c | 10 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/bin/pg_config/win32.mak b/src/bin/pg_config/win32.mak index f00f3012550..77726a2dfce 100644 --- a/src/bin/pg_config/win32.mak +++ b/src/bin/pg_config/win32.mak @@ -55,7 +55,7 @@ CPP_SBRS=. LINK32=link.exe LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ + advapi32.lib shell32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\ /pdb:"$(OUTDIR)\pg_config.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_config.exe" LINK32_OBJS= \ diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h index f0a3a820207..6967731dfe3 100644 --- a/src/include/getaddrinfo.h +++ b/src/include/getaddrinfo.h @@ -15,7 +15,7 @@ * * Copyright (c) 2003-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.17 2005/10/15 02:49:41 momjian Exp $ + * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.17.2.1 2005/12/08 17:52:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,6 +42,10 @@ #define EAI_MEMORY (-10) #define EAI_SYSTEM (-11) #else /* WIN32 */ +#if defined(WIN32_CLIENT_ONLY) +#define WSA_NOT_ENOUGH_MEMORY (WSAENOBUFS) +#define WSATYPE_NOT_FOUND (WSABASEERR+109) +#endif #define EAI_AGAIN WSATRY_AGAIN #define EAI_BADFLAGS WSAEINVAL #define EAI_FAIL WSANO_RECOVERY diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c index 49a7293dec6..f322a85377a 100644 --- a/src/port/getaddrinfo.c +++ b/src/port/getaddrinfo.c @@ -16,7 +16,7 @@ * Copyright (c) 2003-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.21 2005/10/15 02:49:51 momjian Exp $ + * $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.21.2.1 2005/12/08 17:52:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,6 +40,7 @@ #include <windows.h> +#if !defined(WIN32_CLIENT_ONLY) /* * The native routines may or may not exist on the Windows platform we are on, * so we dynamically look up the routines, and call them via function pointers. @@ -129,6 +130,7 @@ haveNativeWindowsIPv6routines(void) return (getaddrinfo_ptr != NULL); } #endif +#endif /* @@ -149,7 +151,7 @@ getaddrinfo(const char *node, const char *service, *psin; struct addrinfo hints; -#ifdef WIN32 +#if defined(WIN32) && !defined(WIN32_CLIENT_ONLY) /* * If Windows has native IPv6 support, use the native Windows routine. @@ -272,7 +274,7 @@ freeaddrinfo(struct addrinfo * res) { if (res) { -#ifdef WIN32 +#if defined(WIN32) && !defined(WIN32_CLIENT_ONLY) /* * If Windows has native IPv6 support, use the native Windows routine. @@ -364,7 +366,7 @@ getnameinfo(const struct sockaddr * sa, int salen, char *node, int nodelen, char *service, int servicelen, int flags) { -#ifdef WIN32 +#if defined(WIN32) && !defined(WIN32_CLIENT_ONLY) /* * If Windows has native IPv6 support, use the native Windows routine. |