diff options
| author | Bruce Momjian | 2003-06-12 08:11:07 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2003-06-12 08:11:07 +0000 |
| commit | dc4ee8a833c09e883f1966d1698792b627649740 (patch) | |
| tree | 3ca0022dc3d9025181334326eff1b6333f9da52a /src/port | |
| parent | a647e30ba3d3d36c6a00909e7c7770adb1676e60 (diff) | |
Back out patch that got bundled into another patch.
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, 3 insertions, 11 deletions
diff --git a/src/port/crypt.c b/src/port/crypt.c index 893e227fcf5..dd3e7ecb2a2 100644 --- a/src/port/crypt.c +++ b/src/port/crypt.c @@ -50,12 +50,8 @@ __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> - -#ifdef WIN32 -#include <windows.h> -#else #include <unistd.h> -#endif +#include <windows.h> 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 3ceaa3e52b7..f585457e7af 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.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 */ #include "c.h" -#if !defined(_MSC_VER) && !defined(__BORLANDC__) #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> @@ -25,7 +24,6 @@ #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 1f45e92f95d..ded857c1fb7 100644 --- a/src/port/inet_aton.c +++ b/src/port/inet_aton.c @@ -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 * incorporated into Postgres for those systems which do not have this @@ -44,10 +44,8 @@ #include "c.h" -#if !defined(WIN32) || (!defined(_MSC_VER) && !defined(__BORLANDC__)) #include <netinet/in.h> #include <ctype.h> -#endif /* * Check whether "cp" is a valid ascii representation |