Back out patch that got bundled into another patch.

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);

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"
 

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