diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 7ff9dc465b..a5402cee60 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -5,7 +5,7 @@
  *
  *	Copyright (c) 2001-2003, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.18 2003/12/25 03:52:51 momjian Exp $
+ *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.19 2004/03/02 18:35:58 momjian Exp $
  * ----------
  */
 #ifndef PGSTAT_H
@@ -271,7 +271,7 @@ typedef struct PgStat_MsgTabstat
  * ----------
  */
 #define PGSTAT_NUM_TABPURGE		((1000 - sizeof(PgStat_MsgHdr))			\
-								/ sizeof(PgStat_TableEntry))
+								/ sizeof(Oid))
 
 /* ----------
  * PgStat_MsgTabpurge			Sent by the backend to tell the collector
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index ddc3982a15..f2519681c2 100644
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.19 2004/02/23 20:48:03 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.20 2004/03/02 18:35:59 momjian Exp $ */
 
 /* undefine and redefine after #include */
 #undef mkdir
@@ -27,7 +27,7 @@
 #define DLLIMPORT __declspec (dllimport)
 #endif
 
-#elif defined(WIN32) && defined(_MSC_VER)		/* not CYGWIN or MingW */
+#elif defined(WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__))		/* not CYGWIN or MingW */
 
 #if defined(_DLL)
 #define DLLIMPORT __declspec (dllexport)
diff --git a/src/port/thread.c b/src/port/thread.c
index d6e1b26973..319139247c 100644
--- a/src/port/thread.c
+++ b/src/port/thread.c
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/port/thread.c,v 1.15 2004/02/11 21:44:06 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/thread.c,v 1.16 2004/03/02 18:35:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 
 #include <sys/types.h>
 #include <errno.h>
-#if defined(WIN32) && defined(_MSC_VER)
+#if defined(WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__))
 #undef ERROR
 #else
 #include <pwd.h>