diff options
author | Bruce Momjian | 2004-09-27 19:16:03 +0000 |
---|---|---|
committer | Bruce Momjian | 2004-09-27 19:16:03 +0000 |
commit | 7d6768bed21ac0f8bbde272fc92e1534b395c33c (patch) | |
tree | 300993ae1d19f7a106cdd9c13b08e2cbc12d378d | |
parent | cf9c6feb4a3884d48f435c4bc31fc018e88fb3ac (diff) |
Remove inclusion of windows.h now that it is included in c.h, per idea
from Peter.
-rw-r--r-- | src/bin/pgevent/pgevent.c | 6 | ||||
-rw-r--r-- | src/bin/psql/input.c | 4 | ||||
-rw-r--r-- | src/bin/psql/mbprint.c | 4 | ||||
-rw-r--r-- | src/bin/psql/startup.c | 1 | ||||
-rw-r--r-- | src/port/crypt.c | 4 | ||||
-rw-r--r-- | src/port/dirmod.c | 1 | ||||
-rw-r--r-- | src/port/sprompt.c | 5 | ||||
-rw-r--r-- | src/timezone/zic.c | 4 |
8 files changed, 4 insertions, 25 deletions
diff --git a/src/bin/pgevent/pgevent.c b/src/bin/pgevent/pgevent.c index ad05d40f78..5d62a4101b 100644 --- a/src/bin/pgevent/pgevent.c +++ b/src/bin/pgevent/pgevent.c @@ -12,9 +12,9 @@ */ -#include "windows.h" -#include "olectl.h" -#include "string.h" +#include <windows.h> +#include <olectl.h> +#include <string.h> /* Global variables */ HANDLE g_module = NULL; /* hModule of DLL */ diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c index 089f8727b7..b13ed62427 100644 --- a/src/bin/psql/input.c +++ b/src/bin/psql/input.c @@ -10,10 +10,6 @@ #include <errno.h> -#ifdef WIN32 -#include <windows.h> -#endif - #include "pqexpbuffer.h" #include "settings.h" #include "tab-complete.h" diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c index f71a117765..5d06abd650 100644 --- a/src/bin/psql/mbprint.c +++ b/src/bin/psql/mbprint.c @@ -14,10 +14,6 @@ #include "mb/pg_wchar.h" -#ifdef WIN32 -#include <windows.h> -#endif - /* * This is an implementation of wcwidth() and wcswidth() as defined in * "The Single UNIX Specification, Version 2, The Open Group, 1997" diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 29408abc7d..387c939678 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -13,7 +13,6 @@ #include <unistd.h> #else /* WIN32 */ #include <io.h> -#include <windows.h> #include <win32.h> #endif /* WIN32 */ diff --git a/src/port/crypt.c b/src/port/crypt.c index a1840630fb..2195603ac4 100644 --- a/src/port/crypt.c +++ b/src/port/crypt.c @@ -52,9 +52,7 @@ __RCSID("$NetBSD$"); #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 df703e5a40..7d4b03cc6d 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -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 4da7349f50..c35e114c83 100644 --- a/src/port/sprompt.c +++ b/src/port/sprompt.c @@ -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; diff --git a/src/timezone/zic.c b/src/timezone/zic.c index cd7f633654..1087c6b8fa 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -18,10 +18,6 @@ #include "private.h" #include "tzfile.h" -#ifdef WIN32 -#include <windows.h> -#endif - #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif |