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

Commit 51e8882

Browse files
committed
Revert part of recent include patch not ready for application.
1 parent 03c2e59 commit 51e8882

File tree

8 files changed

+19
-8
lines changed

8 files changed

+19
-8
lines changed

src/interfaces/libpq/fe-auth.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.117 2006/07/14 04:44:46 momjian Exp $
13+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.118 2006/07/14 04:59:30 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -48,6 +48,7 @@
4848
#endif
4949

5050
#include "libpq-fe.h"
51+
#include "libpq-int.h"
5152
#include "fe-auth.h"
5253
#include "libpq/md5.h"
5354

@@ -57,6 +58,7 @@
5758
* MIT Kerberos authentication system - protocol version 5
5859
*/
5960

61+
#include <krb5.h>
6062
/* Some old versions of Kerberos do not include <com_err.h> in <krb5.h> */
6163
#if !defined(__COM_ERR_H) && !defined(__COM_ERR_H__)
6264
#include <com_err.h>

src/interfaces/libpq/fe-print.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* didn't really belong there.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.69 2006/07/14 04:44:46 momjian Exp $
13+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.70 2006/07/14 04:59:30 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -35,6 +35,7 @@
3535

3636
#include "libpq-fe.h"
3737
#include "libpq-int.h"
38+
#include "pqsignal.h"
3839

3940

4041
static void do_field(const PQprintOpt *po, const PGresult *res,

src/interfaces/libpq/fe-protocol2.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.23 2006/07/14 04:44:46 momjian Exp $
11+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.24 2006/07/14 04:59:30 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -21,6 +21,7 @@
2121
#include "libpq-fe.h"
2222
#include "libpq-int.h"
2323

24+
#include "mb/pg_wchar.h"
2425

2526
#ifdef WIN32
2627
#include "win32.h"

src/interfaces/libpq/fe-secure.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.82 2006/07/14 04:44:46 momjian Exp $
14+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.83 2006/07/14 04:59:30 momjian Exp $
1515
*
1616
* NOTES
1717
* [ Most of these notes are wrong/obsolete, but perhaps not all ]
@@ -84,7 +84,9 @@
8484
#include <ctype.h>
8585

8686
#include "libpq-fe.h"
87+
#include "libpq-int.h"
8788
#include "fe-auth.h"
89+
#include "pqsignal.h"
8890

8991
#ifdef WIN32
9092
#include "win32.h"

src/port/strdup.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/port/strdup.c,v 1.10 2006/07/14 04:44:46 momjian Exp $
11+
* $PostgreSQL: pgsql/src/port/strdup.c,v 1.11 2006/07/14 04:59:30 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

1616
#include "c.h"
1717

18+
#include "strdup.h"
1819

1920

2021
char *

src/timezone/pgtz.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.41 2006/07/14 04:44:46 momjian Exp $
9+
* $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.42 2006/07/14 04:59:30 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -19,10 +19,12 @@
1919
#include <time.h>
2020

2121
#include "miscadmin.h"
22+
#include "pgtime.h"
2223
#include "pgtz.h"
2324
#include "storage/fd.h"
2425
#include "tzfile.h"
2526
#include "utils/datetime.h"
27+
#include "utils/elog.h"
2628
#include "utils/guc.h"
2729
#include "utils/hsearch.h"
2830

src/timezone/strftime.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
1616
*
1717
* IDENTIFICATION
18-
* $PostgreSQL: pgsql/src/timezone/strftime.c,v 1.9 2006/07/14 04:44:46 momjian Exp $
18+
* $PostgreSQL: pgsql/src/timezone/strftime.c,v 1.10 2006/07/14 04:59:30 momjian Exp $
1919
*/
2020

2121
#include "postgres.h"
@@ -24,6 +24,7 @@
2424
#include <locale.h>
2525

2626
#include "private.h"
27+
#include "pgtz.h"
2728
#include "tzfile.h"
2829

2930

src/tutorial/funcs_new.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.9 2006/07/14 04:44:46 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.10 2006/07/14 04:59:30 momjian Exp $ */
22

33
/******************************************************************************
44
These are user-defined functions that can be bound to a Postgres backend
@@ -13,6 +13,7 @@
1313

1414
#include "postgres.h" /* general Postgres declarations */
1515

16+
#include "fmgr.h" /* for argument/result macros */
1617
#include "executor/executor.h" /* for GetAttributeByName() */
1718
#include "utils/geo_decls.h" /* for point type */
1819

0 commit comments

Comments
 (0)