4 files changed, 12 insertions, 4 deletions
diff --git a/src/include/c.h b/src/include/c.h
index 6f3c690fbc9..979ca5885b1 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.147 2003/05/16 01:57:51 momjian Exp $
+ * $Id: c.h,v 1.148 2003/06/12 08:02:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,7 +73,7 @@
 #include <SupportDefs.h>
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(_MSC_VER) && !defined(__BORLANDC__)
 /* We have to redefine some system functions after they are included above */
 #include "pg_config_os.h"
 #endif
diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h
index 416dc65fb1e..ce329a90244 100644
--- a/src/include/getaddrinfo.h
+++ b/src/include/getaddrinfo.h
@@ -16,15 +16,17 @@
  *
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
- * $Id: getaddrinfo.h,v 1.3 2003/06/12 07:36:51 momjian Exp $
+ * $Id: getaddrinfo.h,v 1.4 2003/06/12 08:02:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef GETADDRINFO_H
 #define GETADDRINFO_H
 
+#if !defined(WIN32) || (!defined(_MSC_VER) && !defined(__BORLANDC__))
 #include <sys/socket.h>
 #include <netdb.h>
+#endif
 
 
 #ifndef HAVE_STRUCT_ADDRINFO
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index aaeecf5957b..7835ef8d9ff 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -21,6 +21,10 @@
 #define HAVE_ATEXIT
 #define HAVE_MEMMOVE
 
+#ifdef __BORLANDC__
+#define HAVE_RANDOM
+#endif
+
 /* use _snprintf instead of snprintf */
 #define	HAVE_DECL_SNPRINTF 1
 #define snprintf	_snprintf
diff --git a/src/include/port.h b/src/include/port.h
index f42067d29ab..93d01221834 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: port.h,v 1.3 2003/05/16 04:59:22 momjian Exp $
+ * $Id: port.h,v 1.4 2003/06/12 08:02:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -76,8 +76,10 @@ extern double rint(double x);
 #endif
 
 #ifndef HAVE_INET_ATON
+#if !defined(WIN32) || (!defined(_MSC_VER) && !defined(__BORLANDC__))
 # include <netinet/in.h>
 # include <arpa/inet.h>
+#endif
 extern int inet_aton(const char *cp, struct in_addr * addr);
 #endif