database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-18 17:42:25 +03:00
Code Activity

Prepare code to be built by MSVC:

Browse Source 
o  remove many WIN32_CLIENT_ONLY defines
	o  add WIN32_ONLY_COMPILER define
	o  add 3rd argument to open() for portability
	o  add include/port/win32_msvc directory for
	   system includes

Magnus Hagander
This commit is contained in:
Bruce Momjian
2006-06-07 22:24:46 +00:00
parent 877e296306
commit 399a36a75d
49 changed files with 1154 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/port/getaddrinfo.c
View File

@ -16,7 +16,7 @@
* Copyright (c) 2003-2006, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.23 2006/03/05 15:59:10 momjian Exp $
* $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.24 2006/06/07 22:24:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -24,23 +24,15 @@
/* This is intended to be used in both frontend and backend, so use c.h */
#include "c.h"
#ifndef WIN32_CLIENT_ONLY
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#endif
#include "getaddrinfo.h"
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#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.
@ -130,7 +122,6 @@ haveNativeWindowsIPv6routines(void)
return (getaddrinfo_ptr != NULL);
}
#endif
#endif
/*
@ -151,7 +142,7 @@ getaddrinfo(const char *node, const char *service,
*psin;
struct addrinfo hints;
#if defined(WIN32) && !defined(WIN32_CLIENT_ONLY)
#ifdef WIN32
/*
* If Windows has native IPv6 support, use the native Windows routine.
@ -274,7 +265,7 @@ freeaddrinfo(struct addrinfo * res)
{
if (res)
{
#if defined(WIN32) && !defined(WIN32_CLIENT_ONLY)
#ifdef WIN32
/*
* If Windows has native IPv6 support, use the native Windows routine.
@ -337,9 +328,11 @@ gai_strerror(int errcode)
return "Not enough memory";
#endif
#ifdef EAI_NODATA
#ifndef WIN32_ONLY_COMPILER /* MSVC complains because another case has the same value */
case EAI_NODATA:
return "No host data of that type was found";
#endif
#endif
#ifdef EAI_SERVICE
case EAI_SERVICE:
return "Class type not found";
@ -366,7 +359,7 @@ getnameinfo(const struct sockaddr * sa, int salen,
char *node, int nodelen,
char *service, int servicelen, int flags)
{
#if defined(WIN32) && !defined(WIN32_CLIENT_ONLY)
#ifdef WIN32
/*
* If Windows has native IPv6 support, use the native Windows routine.