diff options
| author | Bruce Momjian | 2005-12-08 17:52:11 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2005-12-08 17:52:11 +0000 |
| commit | 4ebd4224a59e496f5a4f9f8478ce82a5fbf3fa64 (patch) | |
| tree | 8bf739e32db91406025e1e2149236419e8b3f00f /src/include | |
| parent | f38c3e778a7c778da2e07d813288ac72aab934c9 (diff) | |
Disble some Win32-specific code in win32-client-only builds:
I have the problem, when building by MS-VC6.
An error occurs in the 8.1.0 present source codes.
nmake -f win32.mak
..\..\port\getaddrinfo.c(244) : error C2065: 'WSA_NOT_ENOUGH_MEMORY'
..\..\port\getaddrinfo.c(342) : error C2065: 'WSATYPE_NOT_FOUND'
This is used by winsock2.h. However, Construction of a windows base is
winsock.h.
Then, Since MinGW has special environment, this is right. but, it is not
found in VC6.
Furthermore, in getaddrinfo.c, IPV6-API is used by
LoadLibraryA("ws2_32");
Referring to of dll the external memory generates this violation by VC6
specification.
I considered whether the whole should have been converted into winsock2.
However, Now, DLL of MinGW creation operates wonderfully as it is.
That's right, it has pliability by replacement of simple DLL.
Then, I propose the system using winsock(non IPV6) in construction of
VC6.
Hiroshi Saito
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/getaddrinfo.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h index f0a3a820207..956dc81c423 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.18 2005/12/08 17:52:11 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 |