Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 32b24bf

Browse files
committed
Remove inclusion of windows.h now that it is included in c.h, per idea
from Peter.
1 parent 7ceec70 commit 32b24bf

File tree

8 files changed

+11
-32
lines changed

8 files changed

+11
-32
lines changed

src/bin/pgevent/pgevent.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/src/bin/pgevent/pgevent.c,v 1.3 2004/08/30 02:54:40 momjian Exp $
9+
* $PostgreSQL: pgsql/src/bin/pgevent/pgevent.c,v 1.4 2004/09/27 19:16:01 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313

1414

15-
#include "windows.h"
16-
#include "olectl.h"
17-
#include "string.h"
15+
#include <windows.h>
16+
#include <olectl.h>
17+
#include <string.h>
1818

1919
/* Global variables */
2020
HANDLE g_module = NULL; /* hModule of DLL */

src/bin/psql/input.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
*
44
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.37 2004/08/29 05:06:54 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.38 2004/09/27 19:16:02 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "input.h"
1010

1111
#include <errno.h>
1212

13-
#ifdef WIN32
14-
#include <windows.h>
15-
#endif
16-
1713
#include "pqexpbuffer.h"
1814
#include "settings.h"
1915
#include "tab-complete.h"

src/bin/psql/mbprint.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.14 2004/08/29 04:13:02 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.15 2004/09/27 19:16:02 momjian Exp $
77
*/
88

99
#include "postgres_fe.h"
@@ -14,10 +14,6 @@
1414

1515
#include "mb/pg_wchar.h"
1616

17-
#ifdef WIN32
18-
#include <windows.h>
19-
#endif
20-
2117
/*
2218
* This is an implementation of wcwidth() and wcswidth() as defined in
2319
* "The Single UNIX Specification, Version 2, The Open Group, 1997"

src/bin/psql/startup.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.100 2004/09/13 23:07:12 neilc Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.101 2004/09/27 19:16:02 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99

@@ -13,7 +13,6 @@
1313
#include <unistd.h>
1414
#else /* WIN32 */
1515
#include <io.h>
16-
#include <windows.h>
1716
#include <win32.h>
1817
#endif /* WIN32 */
1918

src/port/crypt.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
5252
#include <limits.h>
5353
#include <stdlib.h>
5454

55-
#ifdef WIN32
56-
#include <windows.h>
57-
#else
55+
#ifndef WIN32
5856
#include <unistd.h>
5957
#endif
6058

src/port/dirmod.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/port/dirmod.c,v 1.26 2004/09/10 09:58:21 momjian Exp $
13+
* $PostgreSQL: pgsql/src/port/dirmod.c,v 1.27 2004/09/27 19:16:02 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -402,7 +402,6 @@ rmtree(char *path, bool rmtopdir)
402402
#include <stdio.h>
403403
#include <stdlib.h>
404404
#include <errno.h>
405-
#include <windows.h>
406405

407406
#define halt(str) \
408407
do { \

src/port/sprompt.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/port/sprompt.c,v 1.8 2004/08/29 05:07:02 momjian Exp $
11+
* $PostgreSQL: pgsql/src/port/sprompt.c,v 1.9 2004/09/27 19:16:02 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -30,11 +30,6 @@
3030

3131
#ifdef HAVE_TERMIOS_H
3232
#include <termios.h>
33-
#else
34-
#ifdef WIN32
35-
#include <windows.h>
36-
#undef ERROR
37-
#endif
3833
#endif
3934

4035
bool prompt_state = false;

src/timezone/zic.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
44
*
55
* IDENTIFICATION
6-
* $PostgreSQL: pgsql/src/timezone/zic.c,v 1.12 2004/08/29 05:07:02 momjian Exp $
6+
* $PostgreSQL: pgsql/src/timezone/zic.c,v 1.13 2004/09/27 19:16:03 momjian Exp $
77
*/
88

99
#include "postgres.h"
@@ -18,10 +18,6 @@
1818
#include "private.h"
1919
#include "tzfile.h"
2020

21-
#ifdef WIN32
22-
#include <windows.h>
23-
#endif
24-
2521
#ifdef HAVE_SYS_STAT_H
2622
#include <sys/stat.h>
2723
#endif

0 commit comments

Comments
 (0)