summaryrefslogtreecommitdiff
path: root/src/port
diff options
context:
space:
mode:
authorBruce Momjian2004-09-27 19:16:03 +0000
committerBruce Momjian2004-09-27 19:16:03 +0000
commit32b24bfa975f962e5bc61886ccc78cf656b6295c (patch)
treea2b415c410dae85c4c3cb4c6f7ed262a98933a55 /src/port
parent7ceec70fc79a3c9bbda802b1464f05b791f28f2c (diff)
Remove inclusion of windows.h now that it is included in c.h, per idea
from Peter.
Diffstat (limited to 'src/port')
-rw-r--r--src/port/crypt.c4
-rw-r--r--src/port/dirmod.c3
-rw-r--r--src/port/sprompt.c7
3 files changed, 3 insertions, 11 deletions
diff --git a/src/port/crypt.c b/src/port/crypt.c
index caa8d82142a..10f63e7d203 100644
--- a/src/port/crypt.c
+++ b/src/port/crypt.c
@@ -52,9 +52,7 @@ __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
#include <limits.h>
#include <stdlib.h>
-#ifdef WIN32
-#include <windows.h>
-#else
+#ifndef WIN32
#include <unistd.h>
#endif
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index d2b51716ed3..1141138984d 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -10,7 +10,7 @@
* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.26 2004/09/10 09:58:21 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.27 2004/09/27 19:16:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -402,7 +402,6 @@ rmtree(char *path, bool rmtopdir)
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
-#include <windows.h>
#define halt(str) \
do { \
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index d6b0a71e96c..1e073153442 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/port/sprompt.c,v 1.8 2004/08/29 05:07:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/sprompt.c,v 1.9 2004/09/27 19:16:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,11 +30,6 @@
#ifdef HAVE_TERMIOS_H
#include <termios.h>
-#else
-#ifdef WIN32
-#include <windows.h>
-#undef ERROR
-#endif
#endif
bool prompt_state = false;