aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-06-12 08:11:07 +0000
committerBruce Momjian <bruce@momjian.us>2003-06-12 08:11:07 +0000
commitdc4ee8a833c09e883f1966d1698792b627649740 (patch)
tree3ca0022dc3d9025181334326eff1b6333f9da52a /src/backend
parenta647e30ba3d3d36c6a00909e7c7770adb1676e60 (diff)
downloadpostgresql-dc4ee8a833c09e883f1966d1698792b627649740.tar.gz
postgresql-dc4ee8a833c09e883f1966d1698792b627649740.zip
Back out patch that got bundled into another patch.
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, 2 insertions, 8 deletions
diff --git a/src/backend/libpq/ip.c b/src/backend/libpq/ip.c
index d4290476c83..cd69a078ad3 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.13 2003/06/12 08:02:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/ip.c,v 1.14 2003/06/12 08:11:07 momjian Exp $
*
* This file and the IPV6 implementation were initially provided by
* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
@@ -20,8 +20,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 <errno.h>
#include <unistd.h>
#include <sys/types.h>
@@ -35,8 +33,6 @@
#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 33082dc6984..3410d8012a4 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.14 2003/06/12 08:02:53 momjian Exp $
+ * $Id: encnames.c,v 1.15 2003/06/12 08:11:07 momjian Exp $
*/
#ifdef FRONTEND
#include "postgres_fe.h"
@@ -13,9 +13,7 @@
#include "utils/builtins.h"
#endif
-#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#include <unistd.h>
-#endif
#include "mb/pg_wchar.h"
#include <ctype.h>