Back out patch that got bundled into another patch.
This commit is contained in:
parent
a647e30ba3
commit
dc4ee8a833
|
@ -8,7 +8,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.13 2003/06/12 08:02:53 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.14 2003/06/12 08:11:07 momjian Exp $
|
||||||
*
|
*
|
||||||
* This file and the IPV6 implementation were initially provided by
|
* This file and the IPV6 implementation were initially provided by
|
||||||
* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
|
* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
|
||||||
|
@ -20,8 +20,6 @@
|
||||||
/* This is intended to be used in both frontend and backend, so use c.h */
|
/* This is intended to be used in both frontend and backend, so use c.h */
|
||||||
#include "c.h"
|
#include "c.h"
|
||||||
|
|
||||||
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
|
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -35,8 +33,6 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <sys/file.h>
|
#include <sys/file.h>
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "libpq/ip.h"
|
#include "libpq/ip.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Encoding names and routines for work with it. All
|
* Encoding names and routines for work with it. All
|
||||||
* in this file is shared bedween FE and BE.
|
* in this file is shared bedween FE and BE.
|
||||||
*
|
*
|
||||||
* $Id: encnames.c,v 1.14 2003/06/12 08:02:53 momjian Exp $
|
* $Id: encnames.c,v 1.15 2003/06/12 08:11:07 momjian Exp $
|
||||||
*/
|
*/
|
||||||
#ifdef FRONTEND
|
#ifdef FRONTEND
|
||||||
#include "postgres_fe.h"
|
#include "postgres_fe.h"
|
||||||
|
@ -13,9 +13,7 @@
|
||||||
#include "utils/builtins.h"
|
#include "utils/builtins.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "mb/pg_wchar.h"
|
#include "mb/pg_wchar.h"
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $Id: c.h,v 1.148 2003/06/12 08:02:56 momjian Exp $
|
* $Id: c.h,v 1.149 2003/06/12 08:11:07 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -73,7 +73,7 @@
|
||||||
#include <SupportDefs.h>
|
#include <SupportDefs.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(WIN32) && !defined(_MSC_VER) && !defined(__BORLANDC__)
|
#ifdef WIN32
|
||||||
/* We have to redefine some system functions after they are included above */
|
/* We have to redefine some system functions after they are included above */
|
||||||
#include "pg_config_os.h"
|
#include "pg_config_os.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -16,17 +16,15 @@
|
||||||
*
|
*
|
||||||
* Copyright (c) 2003, PostgreSQL Global Development Group
|
* Copyright (c) 2003, PostgreSQL Global Development Group
|
||||||
*
|
*
|
||||||
* $Id: getaddrinfo.h,v 1.4 2003/06/12 08:02:56 momjian Exp $
|
* $Id: getaddrinfo.h,v 1.5 2003/06/12 08:11:07 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
#ifndef GETADDRINFO_H
|
#ifndef GETADDRINFO_H
|
||||||
#define GETADDRINFO_H
|
#define GETADDRINFO_H
|
||||||
|
|
||||||
#if !defined(WIN32) || (!defined(_MSC_VER) && !defined(__BORLANDC__))
|
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef HAVE_STRUCT_ADDRINFO
|
#ifndef HAVE_STRUCT_ADDRINFO
|
||||||
|
|
|
@ -21,10 +21,6 @@
|
||||||
#define HAVE_ATEXIT
|
#define HAVE_ATEXIT
|
||||||
#define HAVE_MEMMOVE
|
#define HAVE_MEMMOVE
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
|
||||||
#define HAVE_RANDOM
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* use _snprintf instead of snprintf */
|
/* use _snprintf instead of snprintf */
|
||||||
#define HAVE_DECL_SNPRINTF 1
|
#define HAVE_DECL_SNPRINTF 1
|
||||||
#define snprintf _snprintf
|
#define snprintf _snprintf
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $Id: port.h,v 1.4 2003/06/12 08:02:56 momjian Exp $
|
* $Id: port.h,v 1.5 2003/06/12 08:11:07 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -76,10 +76,8 @@ extern double rint(double x);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef HAVE_INET_ATON
|
#ifndef HAVE_INET_ATON
|
||||||
#if !defined(WIN32) || (!defined(_MSC_VER) && !defined(__BORLANDC__))
|
|
||||||
# include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
# include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#endif
|
|
||||||
extern int inet_aton(const char *cp, struct in_addr * addr);
|
extern int inet_aton(const char *cp, struct in_addr * addr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# and a Win32 dynamic library libpq.dll with import library libpqdll.lib
|
# and a Win32 dynamic library libpq.dll with import library libpqdll.lib
|
||||||
|
|
||||||
# Borland C++ base install directory goes here
|
# Borland C++ base install directory goes here
|
||||||
# BCB=d:\Borland\Bcc55
|
BCB=d:\Borland\Bcc55
|
||||||
|
|
||||||
!MESSAGE Building the Win32 DLL and Static Library...
|
!MESSAGE Building the Win32 DLL and Static Library...
|
||||||
!MESSAGE
|
!MESSAGE
|
||||||
|
@ -63,13 +63,8 @@ LIB32=tlib.exe
|
||||||
LIB32_FLAGS=
|
LIB32_FLAGS=
|
||||||
LIB32_OBJS= \
|
LIB32_OBJS= \
|
||||||
"$(OUTDIR)\win32.obj" \
|
"$(OUTDIR)\win32.obj" \
|
||||||
"$(INTDIR)\getaddrinfo.obj" \
|
|
||||||
"$(INTDIR)\inet_aton.obj" \
|
|
||||||
"$(INTDIR)\crypt.obj" \
|
|
||||||
"$(INTDIR)\path.obj" \
|
|
||||||
"$(INTDIR)\dllist.obj" \
|
"$(INTDIR)\dllist.obj" \
|
||||||
"$(INTDIR)\md5.obj" \
|
"$(INTDIR)\md5.obj" \
|
||||||
"$(INTDIR)\ip.obj" \
|
|
||||||
"$(INTDIR)\fe-auth.obj" \
|
"$(INTDIR)\fe-auth.obj" \
|
||||||
"$(INTDIR)\fe-connect.obj" \
|
"$(INTDIR)\fe-connect.obj" \
|
||||||
"$(INTDIR)\fe-exec.obj" \
|
"$(INTDIR)\fe-exec.obj" \
|
||||||
|
@ -82,7 +77,7 @@ LIB32_OBJS= \
|
||||||
"$(INTDIR)\encnames.obj"
|
"$(INTDIR)\encnames.obj"
|
||||||
|
|
||||||
RSC=brcc32.exe
|
RSC=brcc32.exe
|
||||||
RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
|
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
|
||||||
|
|
||||||
LINK32=ilink32.exe
|
LINK32=ilink32.exe
|
||||||
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
|
LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
|
||||||
|
@ -91,20 +86,15 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
.path.obj = $(INTDIR)
|
.path.obj = $(INTDIR)
|
||||||
.path.c = .;..\..\port;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb
|
.path.c = .;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
ALL: "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
|
ALL: "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
|
||||||
|
|
||||||
CLEAN :
|
CLEAN :
|
||||||
-@erase "$(INTDIR)\getaddrinfo.obj"
|
|
||||||
-@erase "$(INTDIR)\inet_aton.obj"
|
|
||||||
-@erase "$(INTDIR)\crypt.obj"
|
|
||||||
-@erase "$(INTDIR)\path.obj"
|
|
||||||
-@erase "$(INTDIR)\dllist.obj"
|
-@erase "$(INTDIR)\dllist.obj"
|
||||||
-@erase "$(INTDIR)\md5.obj"
|
-@erase "$(INTDIR)\md5.obj"
|
||||||
-@erase "$(INTDIR)\ip.obj"
|
|
||||||
-@erase "$(INTDIR)\fe-auth.obj"
|
-@erase "$(INTDIR)\fe-auth.obj"
|
||||||
-@erase "$(INTDIR)\fe-connect.obj"
|
-@erase "$(INTDIR)\fe-connect.obj"
|
||||||
-@erase "$(INTDIR)\fe-exec.obj"
|
-@erase "$(INTDIR)\fe-exec.obj"
|
||||||
|
@ -135,7 +125,7 @@ CLEAN :
|
||||||
"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
|
"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
|
||||||
blibpqdll.def,"$(INTDIR)\libpq.res"
|
blibpqdll.def,"$(INTDIR)\libpq.res"
|
||||||
!
|
!
|
||||||
implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
|
implib -a "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
|
||||||
|
|
||||||
"$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc
|
"$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc
|
||||||
$(RSC) $(RSC_PROJ) libpq.rc
|
$(RSC) $(RSC_PROJ) libpq.rc
|
||||||
|
|
|
@ -96,7 +96,7 @@ EXPORTS
|
||||||
_pg_encoding_to_char @ 92
|
_pg_encoding_to_char @ 92
|
||||||
_pg_utf_mblen @ 93
|
_pg_utf_mblen @ 93
|
||||||
_PQunescapeBytea @ 94
|
_PQunescapeBytea @ 94
|
||||||
_PQfreemem @ 95
|
_PQfreeMem @ 95
|
||||||
|
|
||||||
; Aliases for MS compatible names
|
; Aliases for MS compatible names
|
||||||
PQconnectdb = _PQconnectdb
|
PQconnectdb = _PQconnectdb
|
||||||
|
@ -193,5 +193,5 @@ EXPORTS
|
||||||
pg_encoding_to_char = _pg_encoding_to_char
|
pg_encoding_to_char = _pg_encoding_to_char
|
||||||
pg_utf_mblen = _pg_utf_mblen
|
pg_utf_mblen = _pg_utf_mblen
|
||||||
PQunescapeBytea = _PQunescapeBytea
|
PQunescapeBytea = _PQunescapeBytea
|
||||||
PQfreemem = _PQfreemem
|
PQfreeMem = _PQfreeMem
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.245 2003/06/12 08:02:57 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.246 2003/06/12 08:11:07 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -49,10 +49,6 @@
|
||||||
#include "libpq/ip.h"
|
#include "libpq/ip.h"
|
||||||
#include "mb/pg_wchar.h"
|
#include "mb/pg_wchar.h"
|
||||||
|
|
||||||
/* For FNCTL_NONBLOCK */
|
|
||||||
#if defined(WIN32) || defined(__BEOS__)
|
|
||||||
long ioctlsocket_ret;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define PGPASSFILE ".pgpass"
|
#define PGPASSFILE ".pgpass"
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.93 2003/06/12 08:02:57 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.94 2003/06/12 08:11:07 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -33,11 +33,8 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include "win32.h"
|
#include "win32.h"
|
||||||
|
|
|
@ -96,5 +96,5 @@ EXPORTS
|
||||||
pg_encoding_to_char @ 92
|
pg_encoding_to_char @ 92
|
||||||
pg_utf_mblen @ 93
|
pg_utf_mblen @ 93
|
||||||
PQunescapeBytea @ 94
|
PQunescapeBytea @ 94
|
||||||
PQfreemem @ 95
|
PQfreeMem @ 95
|
||||||
|
|
||||||
|
|
|
@ -36,13 +36,8 @@ OutDir=.\Release
|
||||||
ALL : "$(OUTDIR)\libpq.lib" "$(OUTDIR)\libpq.dll"
|
ALL : "$(OUTDIR)\libpq.lib" "$(OUTDIR)\libpq.dll"
|
||||||
|
|
||||||
CLEAN :
|
CLEAN :
|
||||||
-@erase "$(INTDIR)\getaddrinfo.obj"
|
|
||||||
-@erase "$(INTDIR)\inet_aton.obj"
|
|
||||||
-@erase "$(INTDIR)\crypt.obj"
|
|
||||||
-@erase "$(INTDIR)\path.obj"
|
|
||||||
-@erase "$(INTDIR)\dllist.obj"
|
-@erase "$(INTDIR)\dllist.obj"
|
||||||
-@erase "$(INTDIR)\md5.obj"
|
-@erase "$(INTDIR)\md5.obj"
|
||||||
-@erase "$(INTDIR)\ip.obj"
|
|
||||||
-@erase "$(INTDIR)\fe-auth.obj"
|
-@erase "$(INTDIR)\fe-auth.obj"
|
||||||
-@erase "$(INTDIR)\fe-connect.obj"
|
-@erase "$(INTDIR)\fe-connect.obj"
|
||||||
-@erase "$(INTDIR)\fe-exec.obj"
|
-@erase "$(INTDIR)\fe-exec.obj"
|
||||||
|
@ -77,13 +72,8 @@ LIB32=link.exe -lib
|
||||||
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\libpq.lib"
|
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\libpq.lib"
|
||||||
LIB32_OBJS= \
|
LIB32_OBJS= \
|
||||||
"$(OUTDIR)\win32.obj" \
|
"$(OUTDIR)\win32.obj" \
|
||||||
"$(INTDIR)\getaddrinfo.obj" \
|
|
||||||
"$(INTDIR)\inet_aton.obj" \
|
|
||||||
"$(INTDIR)\crypt.obj" \
|
|
||||||
"$(INTDIR)\path.obj" \
|
|
||||||
"$(INTDIR)\dllist.obj" \
|
"$(INTDIR)\dllist.obj" \
|
||||||
"$(INTDIR)\md5.obj" \
|
"$(INTDIR)\md5.obj" \
|
||||||
"$(INTDIR)\ip.obj" \
|
|
||||||
"$(INTDIR)\fe-auth.obj" \
|
"$(INTDIR)\fe-auth.obj" \
|
||||||
"$(INTDIR)\fe-connect.obj" \
|
"$(INTDIR)\fe-connect.obj" \
|
||||||
"$(INTDIR)\fe-exec.obj" \
|
"$(INTDIR)\fe-exec.obj" \
|
||||||
|
@ -122,25 +112,6 @@ LINK32_OBJS= \
|
||||||
$(LINK32_FLAGS) $(LINK32_OBJS)
|
$(LINK32_FLAGS) $(LINK32_OBJS)
|
||||||
<<
|
<<
|
||||||
|
|
||||||
"$(OUTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c
|
|
||||||
$(CPP) @<<
|
|
||||||
$(CPP_PROJ) ..\..\port\getaddrinfo.c
|
|
||||||
<<
|
|
||||||
|
|
||||||
"$(OUTDIR)\inet_aton.obj" : ..\..\port\inet_aton.c
|
|
||||||
$(CPP) @<<
|
|
||||||
$(CPP_PROJ) ..\..\port\inet_aton.c
|
|
||||||
<<
|
|
||||||
|
|
||||||
"$(OUTDIR)\crypt.obj" : ..\..\port\crypt.c
|
|
||||||
$(CPP) @<<
|
|
||||||
$(CPP_PROJ) ..\..\port\crypt.c
|
|
||||||
<<
|
|
||||||
|
|
||||||
"$(OUTDIR)\path.obj" : ..\..\port\path.c
|
|
||||||
$(CPP) @<<
|
|
||||||
$(CPP_PROJ) ..\..\port\path.c
|
|
||||||
<<
|
|
||||||
|
|
||||||
"$(OUTDIR)\dllist.obj" : ..\..\backend\lib\dllist.c
|
"$(OUTDIR)\dllist.obj" : ..\..\backend\lib\dllist.c
|
||||||
$(CPP) @<<
|
$(CPP) @<<
|
||||||
|
@ -153,10 +124,6 @@ LINK32_OBJS= \
|
||||||
$(CPP_PROJ) ..\..\backend\libpq\md5.c
|
$(CPP_PROJ) ..\..\backend\libpq\md5.c
|
||||||
<<
|
<<
|
||||||
|
|
||||||
"$(OUTDIR)\ip.obj" : ..\..\backend\libpq\ip.c
|
|
||||||
$(CPP) @<<
|
|
||||||
$(CPP_PROJ) ..\..\backend\libpq\ip.c
|
|
||||||
<<
|
|
||||||
|
|
||||||
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
|
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
|
||||||
$(CPP) @<<
|
$(CPP) @<<
|
||||||
|
|
|
@ -50,12 +50,8 @@ __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
#include <windows.h>
|
|
||||||
#else
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#include <windows.h>
|
||||||
|
|
||||||
static int des_setkey(const char *key);
|
static int des_setkey(const char *key);
|
||||||
static int des_cipher(const char *in, char *out, long salt, int num_iter);
|
static int des_cipher(const char *in, char *out, long salt, int num_iter);
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.5 2003/06/12 08:02:57 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.6 2003/06/12 08:11:07 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -16,7 +16,6 @@
|
||||||
/* This is intended to be used in both frontend and backend, so use c.h */
|
/* This is intended to be used in both frontend and backend, so use c.h */
|
||||||
#include "c.h"
|
#include "c.h"
|
||||||
|
|
||||||
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
|
@ -25,7 +24,6 @@
|
||||||
#ifdef HAVE_UNIX_SOCKETS
|
#ifdef HAVE_UNIX_SOCKETS
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "getaddrinfo.h"
|
#include "getaddrinfo.h"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: inet_aton.c,v 1.3 2003/06/12 08:02:57 momjian Exp $
|
/* $Id: inet_aton.c,v 1.4 2003/06/12 08:11:07 momjian Exp $
|
||||||
*
|
*
|
||||||
* This inet_aton() function was taken from the GNU C library and
|
* This inet_aton() function was taken from the GNU C library and
|
||||||
* incorporated into Postgres for those systems which do not have this
|
* incorporated into Postgres for those systems which do not have this
|
||||||
|
@ -44,10 +44,8 @@
|
||||||
|
|
||||||
#include "c.h"
|
#include "c.h"
|
||||||
|
|
||||||
#if !defined(WIN32) || (!defined(_MSC_VER) && !defined(__BORLANDC__))
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check whether "cp" is a valid ascii representation
|
* Check whether "cp" is a valid ascii representation
|
||||||
|
|
Loading…
Reference in New Issue