aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-06-12 08:15:29 +0000
committerBruce Momjian <bruce@momjian.us>2003-06-12 08:15:29 +0000
commitb14295cfe4f2a738a0b023d10bc508da2c458bdb (patch)
tree372f60ae84e507d582a83600a700304b462f94da /src/backend
parentdc4ee8a833c09e883f1966d1698792b627649740 (diff)
downloadpostgresql-b14295cfe4f2a738a0b023d10bc508da2c458bdb.tar.gz
postgresql-b14295cfe4f2a738a0b023d10bc508da2c458bdb.zip
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/backend')
-rw-r--r--src/backend/libpq/ip.c6
-rw-r--r--src/backend/utils/mb/encnames.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/libpq/ip.c b/src/backend/libpq/ip.c
index cd69a078ad3..091b381ec17 100644
--- a/src/backend/libpq/ip.c
+++ b/src/backend/libpq/ip.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.14 2003/06/12 08:11:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.15 2003/06/12 08:15:28 momjian Exp $
*
* This file and the IPV6 implementation were initially provided by
* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
@@ -20,6 +20,8 @@
/* 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 <errno.h>
#include <unistd.h>
#include <sys/types.h>
@@ -33,6 +35,8 @@
#include <arpa/inet.h>
#include <sys/file.h>
+#endif
+
#include "libpq/ip.h"
diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c
index 3410d8012a4..93a7dc240de 100644
--- a/src/backend/utils/mb/encnames.c
+++ b/src/backend/utils/mb/encnames.c
@@ -2,7 +2,7 @@
* Encoding names and routines for work with it. All
* in this file is shared bedween FE and BE.
*
- * $Id: encnames.c,v 1.15 2003/06/12 08:11:07 momjian Exp $
+ * $Id: encnames.c,v 1.16 2003/06/12 08:15:28 momjian Exp $
*/
#ifdef FRONTEND
#include "postgres_fe.h"
@@ -13,7 +13,9 @@
#include "utils/builtins.h"
#endif
+#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <unistd.h>
+#endif
#include "mb/pg_wchar.h"
#include <ctype.h>