diff options
| author | Bruce Momjian | 2003-06-12 08:15:29 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2003-06-12 08:15:29 +0000 |
| commit | b14295cfe4f2a738a0b023d10bc508da2c458bdb (patch) | |
| tree | 372f60ae84e507d582a83600a700304b462f94da /src/port | |
| parent | dc4ee8a833c09e883f1966d1698792b627649740 (diff) | |
Attached is the complete diff against current CVS.
Compiles on BCC 5.5 and VC++ 6.0 (with warnings).
Karl Waclawek
Diffstat (limited to 'src/port')
| -rw-r--r-- | src/port/crypt.c | 6 | ||||
| -rw-r--r-- | src/port/getaddrinfo.c | 4 | ||||
| -rw-r--r-- | src/port/inet_aton.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/port/crypt.c b/src/port/crypt.c index dd3e7ecb2a2..893e227fcf5 100644 --- a/src/port/crypt.c +++ b/src/port/crypt.c @@ -50,8 +50,12 @@ __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $"); #include <sys/types.h> #include <limits.h> #include <stdlib.h> -#include <unistd.h> + +#ifdef WIN32 #include <windows.h> +#else +#include <unistd.h> +#endif static int des_setkey(const char *key); static int des_cipher(const char *in, char *out, long salt, int num_iter); diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c index f585457e7af..2f2449629b6 100644 --- a/src/port/getaddrinfo.c +++ b/src/port/getaddrinfo.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.6 2003/06/12 08:11:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.7 2003/06/12 08:15:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,7 @@ /* This is intended to be used in both frontend and backend, so use c.h */ #include "c.h" +#if !defined(_MSC_VER) && !defined(__BORLANDC__) #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> @@ -24,6 +25,7 @@ #ifdef HAVE_UNIX_SOCKETS #include <sys/un.h> #endif +#endif #include "getaddrinfo.h" diff --git a/src/port/inet_aton.c b/src/port/inet_aton.c index ded857c1fb7..f2458db74c7 100644 --- a/src/port/inet_aton.c +++ b/src/port/inet_aton.c @@ -1,4 +1,4 @@ -/* $Id: inet_aton.c,v 1.4 2003/06/12 08:11:07 momjian Exp $ +/* $Id: inet_aton.c,v 1.5 2003/06/12 08:15:29 momjian Exp $ * * This inet_aton() function was taken from the GNU C library and * incorporated into Postgres for those systems which do not have this @@ -44,8 +44,10 @@ #include "c.h" +#if !defined(_MSC_VER) && !defined(__BORLANDC__) #include <netinet/in.h> #include <ctype.h> +#endif /* * Check whether "cp" is a valid ascii representation |