diff options
| author | Bruce Momjian | 2001-10-28 06:26:15 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2001-10-28 06:26:15 +0000 |
| commit | 6783b2372ef13c141649840a836ff0a954ea1d4d (patch) | |
| tree | 81c727b2b08930bcf3ab7107c84ef59f1f68a78d /src/include | |
| parent | c29797deeb5dfca61b8959344b682b4c32fe53a1 (diff) | |
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
Diffstat (limited to 'src/include')
275 files changed, 888 insertions, 627 deletions
diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h index 2339c290308..83173548cb5 100644 --- a/src/include/access/attnum.h +++ b/src/include/access/attnum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: attnum.h,v 1.13 2001/10/25 05:49:55 momjian Exp $ + * $Id: attnum.h,v 1.14 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -59,4 +59,5 @@ typedef int16 AttrNumber; */ #define AttrOffsetGetAttrNumber(attributeOffset) \ ((AttrNumber) (1 + attributeOffset)) + #endif /* ATTNUM_H */ diff --git a/src/include/access/clog.h b/src/include/access/clog.h index 60589e8bfc9..5710c978286 100644 --- a/src/include/access/clog.h +++ b/src/include/access/clog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clog.h,v 1.3 2001/10/25 05:49:55 momjian Exp $ + * $Id: clog.h,v 1.4 2001/10/28 06:25:59 momjian Exp $ */ #ifndef CLOG_H #define CLOG_H @@ -46,4 +46,5 @@ extern void TruncateCLOG(TransactionId oldestXact); extern void clog_redo(XLogRecPtr lsn, XLogRecord *record); extern void clog_undo(XLogRecPtr lsn, XLogRecord *record); extern void clog_desc(char *buf, uint8 xl_info, char *rec); + #endif /* CLOG_H */ diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 633fb21dfa7..88c1c06699b 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.28 2001/10/25 05:49:55 momjian Exp $ + * $Id: genam.h,v 1.29 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,4 +63,5 @@ extern struct FmgrInfo *index_getprocinfo(Relation irel, AttrNumber attnum, extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void IndexScanEnd(IndexScanDesc scan); + #endif /* GENAM_H */ diff --git a/src/include/access/gist.h b/src/include/access/gist.h index e7cff61ee8c..14d45ff2585 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gist.h,v 1.33 2001/10/25 05:49:55 momjian Exp $ + * $Id: gist.h,v 1.34 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -184,4 +184,5 @@ extern void gist_desc(char *buf, uint8 xl_info, char *rec); /* gistget.c */ extern Datum gistgettuple(PG_FUNCTION_ARGS); + #endif /* GIST_H */ diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index ade886b0773..a96c4d5f96e 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gistscan.h,v 1.17 2001/10/25 05:49:55 momjian Exp $ + * $Id: gistscan.h,v 1.18 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern Datum gistrestrpos(PG_FUNCTION_ARGS); extern Datum gistendscan(PG_FUNCTION_ARGS); extern void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); extern void AtEOXact_gist(void); + #endif /* GISTSCAN_H */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 11950f56644..5d02855e76d 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.40 2001/10/25 05:49:55 momjian Exp $ + * $Id: hash.h,v 1.41 2001/10/28 06:25:59 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -81,8 +81,8 @@ typedef struct HashPageOpaqueData bits16 hasho_flag; /* is this page a bucket or ovfl */ Bucket hasho_bucket; /* bucket number this pg belongs to */ OverflowPageAddress hasho_oaddr; /* ovfl address of this ovfl pg */ - BlockNumber hasho_nextblkno; /* next ovfl blkno */ - BlockNumber hasho_prevblkno; /* previous ovfl (or bucket) blkno */ + BlockNumber hasho_nextblkno; /* next ovfl blkno */ + BlockNumber hasho_prevblkno; /* previous ovfl (or bucket) blkno */ } HashPageOpaqueData; typedef HashPageOpaqueData *HashPageOpaque; @@ -150,12 +150,12 @@ typedef struct HashMetaPageData uint16 hashm_bshift; /* bucket shift */ uint16 hashm_bmsize; /* bitmap array size (bytes) - must be a * power of 2 */ - uint32 hashm_maxbucket; /* ID of maximum bucket in use */ + uint32 hashm_maxbucket; /* ID of maximum bucket in use */ uint32 hashm_highmask; /* mask to modulo into entire table */ uint32 hashm_lowmask; /* mask to modulo into lower half of table */ uint32 hashm_ovflpoint;/* pageno. from which ovflpgs being * allocated */ - uint32 hashm_lastfreed; /* last ovflpage freed */ + uint32 hashm_lastfreed; /* last ovflpage freed */ uint32 hashm_nmaps; /* Initial number of bitmaps */ uint32 hashm_spares[NCACHED]; /* spare pages available at * splitpoints */ @@ -327,4 +327,5 @@ extern void _hash_checkpage(Page page, int flags); extern void hash_redo(XLogRecPtr lsn, XLogRecord *record); extern void hash_undo(XLogRecPtr lsn, XLogRecord *record); extern void hash_desc(char *buf, uint8 xl_info, char *rec); + #endif /* HASH_H */ diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index ae51658305d..61fa3afea56 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.69 2001/10/25 05:49:55 momjian Exp $ + * $Id: heapam.h,v 1.70 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -245,4 +245,5 @@ extern HeapTuple heap_addheader(int natts, Size structlen, void *structure); /* in common/heap/stats.c */ extern void PrintHeapAccessStatistics(HeapAccessStatistics stats); extern void initam(void); + #endif /* HEAPAM_H */ diff --git a/src/include/access/hio.h b/src/include/access/hio.h index c6a5eac0e7e..924b3494ea9 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hio.h,v 1.20 2001/10/25 05:49:55 momjian Exp $ + * $Id: hio.h,v 1.21 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern void RelationPutHeapTuple(Relation relation, Buffer buffer, HeapTuple tuple); extern Buffer RelationGetBufferForTuple(Relation relation, Size len, Buffer otherBuffer); + #endif /* HIO_H */ diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 257b9d8a4ab..ed3afc2e743 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.49 2001/10/25 05:49:55 momjian Exp $ + * $Id: htup.h,v 1.50 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -275,4 +275,5 @@ typedef HeapTupleData *HeapTuple; #define HeapTupleHasExtended(tuple) \ ((((HeapTuple)(tuple))->t_data->t_infomask & HEAP_HASEXTENDED) != 0) + #endif /* HTUP_H */ diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index b724bfaa5e6..57b21510199 100644 --- a/src/include/access/ibit.h +++ b/src/include/access/ibit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: ibit.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ + * $Id: ibit.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ typedef IndexAttributeBitMapData *IndexAttributeBitMap; * True iff attribute bit map is valid. */ #define IndexAttributeBitMapIsValid(bits) PointerIsValid(bits) + #endif /* IBIT_H */ diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h index 514bec38447..58ee91c07ac 100644 --- a/src/include/access/iqual.h +++ b/src/include/access/iqual.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: iqual.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ + * $Id: iqual.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern int NIndexTupleProcessed; extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc, int scanKeySize, ScanKey key); + #endif /* IQUAL_H */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index 6f94b8ccc6e..7b88b2f2acd 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.21 2001/10/25 05:49:55 momjian Exp $ + * $Id: istrat.h,v 1.22 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,4 +63,5 @@ extern void IndexSupportInitialize(IndexStrategy indexStrategy, StrategyNumber maxStrategyNumber, StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber); + #endif /* ISTRAT_H */ diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index b0e1dd305de..82a4cb285f4 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.57 2001/10/25 05:49:55 momjian Exp $ + * $Id: nbtree.h,v 1.58 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,11 +44,11 @@ typedef struct BTPageOpaqueData typedef BTPageOpaqueData *BTPageOpaque; /* Bits defined in btpo_flags */ -#define BTP_LEAF (1 << 0)/* leaf page, if not internal page */ -#define BTP_ROOT (1 << 1)/* root page (has no parent) */ -#define BTP_FREE (1 << 2)/* page not in use */ -#define BTP_META (1 << 3)/* meta-page */ -#define BTP_REORDER (1 << 4)/* items need reordering */ +#define BTP_LEAF (1 << 0) /* leaf page, if not internal page */ +#define BTP_ROOT (1 << 1) /* root page (has no parent) */ +#define BTP_FREE (1 << 2) /* page not in use */ +#define BTP_META (1 << 3) /* meta-page */ +#define BTP_REORDER (1 << 4) /* items need reordering */ /* @@ -68,7 +68,7 @@ typedef struct BTMetaPageData ((BTMetaPageData *) &((PageHeader) p)->pd_linp[0]) #define BTREE_METAPAGE 0 /* first page is meta */ -#define BTREE_MAGIC 0x053162/* magic number of btree pages */ +#define BTREE_MAGIC 0x053162 /* magic number of btree pages */ #define BTreeInvalidParent(opaque) \ (opaque->btpo_parent == InvalidBlockNumber || \ @@ -223,14 +223,14 @@ typedef BTStackData *BTStack; * XLOG allows to store some information in high 4 bits of log * record xl_info field */ -#define XLOG_BTREE_DELETE 0x00/* delete btitem */ -#define XLOG_BTREE_INSERT 0x10/* add btitem without split */ -#define XLOG_BTREE_SPLIT 0x20/* add btitem with split */ -#define XLOG_BTREE_SPLEFT 0x30/* as above + flag that new btitem */ +#define XLOG_BTREE_DELETE 0x00 /* delete btitem */ +#define XLOG_BTREE_INSERT 0x10 /* add btitem without split */ +#define XLOG_BTREE_SPLIT 0x20 /* add btitem with split */ +#define XLOG_BTREE_SPLEFT 0x30 /* as above + flag that new btitem */ /* goes to the left sibling */ -#define XLOG_BTREE_NEWROOT 0x40/* new root page */ +#define XLOG_BTREE_NEWROOT 0x40 /* new root page */ -#define XLOG_BTREE_LEAF 0x80/* leaf/internal page was changed */ +#define XLOG_BTREE_LEAF 0x80 /* leaf/internal page was changed */ /* * All what we need to find changed index tuple @@ -398,4 +398,5 @@ extern BTSpool *_bt_spoolinit(Relation index, bool isunique); extern void _bt_spooldestroy(BTSpool *btspool); extern void _bt_spool(BTItem btitem, BTSpool *btspool); extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2); + #endif /* NBTREE_H */ diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index 0f1dbed15b1..68420cd1b98 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: printtup.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ + * $Id: printtup.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc, extern bool getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typElem, bool *typIsVarlena); + #endif /* PRINTTUP_H */ diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index 87e1b36c3fb..e79ad6cdf6d 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relscan.h,v 1.23 2001/10/25 05:49:55 momjian Exp $ + * $Id: relscan.h,v 1.24 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,4 +75,5 @@ typedef IndexScanDesc *IndexScanDescPtr; * True iff the index scan is valid. */ #define IndexScanIsValid(scan) PointerIsValid(scan) + #endif /* RELSCAN_H */ diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h index 106370858d1..3ea234f83ef 100644 --- a/src/include/access/rmgr.h +++ b/src/include/access/rmgr.h @@ -3,7 +3,7 @@ * * Resource managers definition * - * $Id: rmgr.h,v 1.7 2001/10/25 05:49:55 momjian Exp $ + * $Id: rmgr.h,v 1.8 2001/10/28 06:25:59 momjian Exp $ */ #ifndef RMGR_H #define RMGR_H @@ -24,4 +24,5 @@ typedef uint8 RmgrId; #define RM_GIST_ID 14 #define RM_SEQ_ID 15 #define RM_MAX_ID RM_SEQ_ID + #endif /* RMGR_H */ diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index b9737ceeecd..6e605e7016a 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.25 2001/10/25 05:49:55 momjian Exp $ + * $Id: rtree.h,v 1.26 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,4 +134,5 @@ extern void AtEOXact_rtree(void); /* rtstrat.c */ extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); + #endif /* RTREE_H */ diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h index 5cfba8e08f7..af169d007b0 100644 --- a/src/include/access/rtscan.h +++ b/src/include/access/rtscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rtscan.h,v 1.11 2001/10/25 05:49:55 momjian Exp $ + * $Id: rtscan.h,v 1.12 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,5 @@ #include "utils/rel.h" void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); + #endif /* RTSCAN_H */ diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h index 3caa8b3ae42..05a72b50324 100644 --- a/src/include/access/sdir.h +++ b/src/include/access/sdir.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sdir.h,v 1.10 2001/10/25 05:49:55 momjian Exp $ + * $Id: sdir.h,v 1.11 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,9 +21,9 @@ */ typedef enum ScanDirection { - BackwardScanDirection = -1, - NoMovementScanDirection = 0, - ForwardScanDirection = 1 + BackwardScanDirection = -1, + NoMovementScanDirection = 0, + ForwardScanDirection = 1 } ScanDirection; /* @@ -54,4 +54,5 @@ typedef enum ScanDirection */ #define ScanDirectionIsForward(direction) \ ((bool) ((direction) == ForwardScanDirection)) + #endif /* SDIR_H */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index 45061e38ffe..8a2dc2c3fb5 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: skey.h,v 1.18 2001/10/25 05:49:55 momjian Exp $ + * $Id: skey.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ * * Note: * Needs more accessor/assignment routines. @@ -47,4 +47,5 @@ extern void ScanKeyEntryInitialize(ScanKey entry, bits16 flags, extern void ScanKeyEntryInitializeWithInfo(ScanKey entry, bits16 flags, AttrNumber attributeNumber, FmgrInfo *finfo, MemoryContext mcxt, Datum argument); + #endif /* SKEY_H */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index 7c376ac37c2..9470c5664fc 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.23 2001/10/25 05:49:55 momjian Exp $ + * $Id: strat.h,v 1.24 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -86,4 +86,5 @@ typedef struct IndexStrategyData } IndexStrategyData; /* VARIABLE LENGTH STRUCTURE */ typedef IndexStrategyData *IndexStrategy; + #endif /* STRAT_H */ diff --git a/src/include/access/transam.h b/src/include/access/transam.h index e8fc34fd909..2e22b69fa7d 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.42 2001/10/25 05:49:55 momjian Exp $ + * $Id: transam.h,v 1.43 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -121,4 +121,5 @@ extern bool AMI_OVERRIDE; /* in varsup.c */ extern VariableCache ShmemVariableCache; + #endif /* TRAMSAM_H */ diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index afb96c37a3e..e4f9dd0d3a7 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.31 2001/10/25 05:49:55 momjian Exp $ + * $Id: tupdesc.h,v 1.32 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,4 +74,5 @@ extern bool TupleDescInitEntry(TupleDesc desc, bool attisset); extern TupleDesc BuildDescForRelation(List *schema, char *relname); + #endif /* TUPDESC_H */ diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index 97fb618ce1b..0d5606390dd 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupmacs.h,v 1.18 2001/10/25 05:49:55 momjian Exp $ + * $Id: tupmacs.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -179,4 +179,5 @@ } \ } while (0) #endif /* SIZEOF_DATUM == 8 */ + #endif diff --git a/src/include/access/valid.h b/src/include/access/valid.h index d1e32602a3c..4b051531472 100644 --- a/src/include/access/valid.h +++ b/src/include/access/valid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: valid.h,v 1.24 2001/10/25 05:49:55 momjian Exp $ + * $Id: valid.h,v 1.25 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -130,4 +130,5 @@ do \ (tuple)->t_data = NULL; \ } \ } while (0) + #endif /* VALID_H */ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index f85e21eee4a..c6297aa01c9 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.39 2001/10/25 05:49:55 momjian Exp $ + * $Id: xact.h,v 1.40 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,4 +134,5 @@ extern Datum xidin(PG_FUNCTION_ARGS); extern Datum xidout(PG_FUNCTION_ARGS); extern Datum xideq(PG_FUNCTION_ARGS); extern Datum xid_age(PG_FUNCTION_ARGS); + #endif /* XACT_H */ diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 04bb18b2e5d..b3f54097a9f 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlog.h,v 1.26 2001/10/25 05:49:56 momjian Exp $ + * $Id: xlog.h,v 1.27 2001/10/28 06:25:59 momjian Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -215,4 +215,5 @@ extern XLogRecPtr GetUndoRecPtr(void); extern bool check_xlog_sync_method(const char *method); extern void assign_xlog_sync_method(const char *method); + #endif /* XLOG_H */ diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h index c2d1f2168e6..5e14710aa7c 100644 --- a/src/include/access/xlogdefs.h +++ b/src/include/access/xlogdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlogdefs.h,v 1.5 2001/10/25 05:49:56 momjian Exp $ + * $Id: xlogdefs.h,v 1.6 2001/10/28 06:25:59 momjian Exp $ */ #ifndef XLOG_DEFS_H #define XLOG_DEFS_H @@ -55,4 +55,5 @@ typedef struct XLogRecPtr * pg_clog after shutdown, in future. */ typedef uint32 StartUpID; + #endif /* XLOG_DEFS_H */ diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h index b49bcbe1341..9a96b0f6ed6 100644 --- a/src/include/access/xlogutils.h +++ b/src/include/access/xlogutils.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlogutils.h,v 1.9 2001/10/25 05:49:56 momjian Exp $ + * $Id: xlogutils.h,v 1.10 2001/10/28 06:25:59 momjian Exp $ */ #ifndef XLOG_UTILS_H #define XLOG_UTILS_H @@ -25,4 +25,5 @@ extern void XLogCloseRelationCache(void); extern Relation XLogOpenRelation(bool redo, RmgrId rmid, RelFileNode rnode); extern Buffer XLogReadBuffer(bool extend, Relation reln, BlockNumber blkno); + #endif diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 0388e9ecda3..63fd93e483b 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bootstrap.h,v 1.24 2001/10/25 05:49:56 momjian Exp $ + * $Id: bootstrap.h,v 1.25 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,4 +62,5 @@ extern void Int_yyerror(const char *str); #define BS_XLOG_STARTUP 2 #define BS_XLOG_CHECKPOINT 3 #define BS_XLOG_SHUTDOWN 4 + #endif /* BOOTSTRAP_H */ diff --git a/src/include/c.h b/src/include/c.h index 0d129180a51..10385c04bf4 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.106 2001/10/25 05:49:54 momjian Exp $ + * $Id: c.h,v 1.107 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -645,4 +645,5 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); * end of c.h * ---------------- */ + #endif /* C_H */ diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index 30ae2bbd2e5..182c3039116 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catalog.h,v 1.18 2001/10/25 05:49:56 momjian Exp $ + * $Id: catalog.h,v 1.19 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,5 @@ extern bool IsSystemRelationName(const char *relname); extern bool IsSharedSystemRelationName(const char *relname); extern Oid newoid(void); + #endif /* CATALOG_H */ diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h index a00d6fd9505..b50e6a00b98 100644 --- a/src/include/catalog/catname.h +++ b/src/include/catalog/catname.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catname.h,v 1.21 2001/10/25 05:49:56 momjian Exp $ + * $Id: catname.h,v 1.22 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,5 @@ #define TriggerRelationName "pg_trigger" extern char *SharedSystemRelationNames[]; + #endif /* CATNAME_H */ diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index dedd4695162..27be36fed03 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catversion.h,v 1.101 2001/10/25 14:10:06 tgl Exp $ + * $Id: catversion.h,v 1.102 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,4 +54,5 @@ /* yyyymmddN */ #define CATALOG_VERSION_NO 200110251 + #endif diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index e849ae28d69..cf3c8de0ea5 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heap.h,v 1.39 2001/10/25 05:49:56 momjian Exp $ + * $Id: heap.h,v 1.40 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,4 +52,5 @@ extern Form_pg_attribute SystemAttributeDefinition(AttrNumber attno, extern Form_pg_attribute SystemAttributeByName(const char *attname, bool relhasoids); + #endif /* HEAP_H */ diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 82f30ea4c3a..9fc4fa66fbc 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: index.h,v 1.41 2001/10/25 05:49:56 momjian Exp $ + * $Id: index.h,v 1.42 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,4 +71,5 @@ extern double IndexBuildHeapScan(Relation heapRelation, extern bool reindex_index(Oid indexId, bool force, bool inplace); extern bool activate_indexes_of_a_table(Oid relid, bool activate); extern bool reindex_relation(Oid relid, bool force); + #endif /* INDEX_H */ diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index 11d56f5d9f8..d75364e41da 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: indexing.h,v 1.54 2001/10/25 05:49:56 momjian Exp $ + * $Id: indexing.h,v 1.55 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -196,4 +196,5 @@ DECLARE_UNIQUE_INDEX(pg_type_typname_index on pg_type using btree(typname name_o /* last step of initialization script: build the indices declared above */ BUILD_INDICES + #endif /* INDEXING_H */ diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index 5aa5dc3c378..f20ac5332a7 100644 --- a/src/include/catalog/pg_aggregate.h +++ b/src/include/catalog/pg_aggregate.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_aggregate.h,v 1.33 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_aggregate.h,v 1.34 2001/10/28 06:25:59 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -164,4 +164,5 @@ extern void AggregateCreate(char *aggName, extern Datum AggNameGetInitVal(char *aggName, Oid basetype, bool *isNull); + #endif /* PG_AGGREGATE_H */ diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h index 21859dda6c6..3037911124c 100644 --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_am.h,v 1.19 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_am.h,v 1.20 2001/10/28 06:25:59 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -107,4 +107,5 @@ DATA(insert OID = 405 ( hash PGUID 1 1 0 f f f t hashgettuple hashinsert hashbe DESCR("hash index access method"); DATA(insert OID = 783 ( gist PGUID 100 7 0 f t f f gistgettuple gistinsert gistbeginscan gistrescan gistendscan gistmarkpos gistrestrpos gistbuild gistbulkdelete gistcostestimate )); DESCR("GiST index access method"); + #endif /* PG_AM_H */ diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index 97331dbbc21..9b2c0709a52 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -16,7 +16,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amop.h,v 1.43 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_amop.h,v 1.44 2001/10/28 06:25:59 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -425,4 +425,5 @@ DATA(insert ( 2001 1 f 1550 )); DATA(insert ( 2004 1 f 1062 )); /* timestamp_ops */ DATA(insert ( 2040 1 f 2060 )); + #endif /* PG_AMOP_H */ diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index 38a98d28fda..dda8fbc3a50 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -14,7 +14,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amproc.h,v 1.32 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_amproc.h,v 1.33 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -129,4 +129,5 @@ DATA(insert ( 1999 1 452 )); DATA(insert ( 2001 1 1696 )); DATA(insert ( 2004 1 456 )); DATA(insert ( 2040 1 452 )); + #endif /* PG_AMPROC_H */ diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 8ed26ccdfca..7a3759f6428 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.77 2001/10/25 05:49:56 momjian Exp $ + * $Id: pg_attribute.h,v 1.78 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -485,4 +485,5 @@ DATA(insert ( 1259 tableoid 26 0 4 -7 0 -1 -1 t p f i f f)); * ---------------- */ DATA(insert ( 376 xactlockfoo 26 0 4 1 0 -1 -1 t p f i f f)); + #endif /* PG_ATTRIBUTE_H */ diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index e6dfb30f642..f5e86ec212f 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_class.h,v 1.55 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_class.h,v 1.56 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -167,4 +167,5 @@ DESCR(""); #define RELKIND_UNCATALOGED 'u' /* temporary heap */ #define RELKIND_TOASTVALUE 't' /* moved off huge values */ #define RELKIND_VIEW 'v' /* view */ + #endif /* PG_CLASS_H */ diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index b701e2b5112..a0646f7b2e1 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_control.h,v 1.4 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_control.h,v 1.5 2001/10/28 06:26:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,11 +51,11 @@ typedef struct CheckPoint /* System status indicator */ typedef enum DBState { - DB_STARTUP = 0, - DB_SHUTDOWNED, - DB_SHUTDOWNING, - DB_IN_RECOVERY, - DB_IN_PRODUCTION + DB_STARTUP = 0, + DB_SHUTDOWNED, + DB_SHUTDOWNING, + DB_IN_RECOVERY, + DB_IN_PRODUCTION } DBState; #define LOCALE_NAME_BUFLEN 128 @@ -110,4 +110,5 @@ typedef struct ControlFileData char lc_collate[LOCALE_NAME_BUFLEN]; char lc_ctype[LOCALE_NAME_BUFLEN]; } ControlFileData; + #endif /* PG_CONTROL_H */ diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h index 439e4fcc3dc..1efad4ee0f9 100644 --- a/src/include/catalog/pg_database.h +++ b/src/include/catalog/pg_database.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_database.h,v 1.19 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_database.h,v 1.20 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -78,4 +78,5 @@ DATAMARKOID(= 2) #define RecoveryDb 2 #undef DATAMARKOID + #endif /* PG_DATABASE_H */ diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h index e8b304ba3be..d6c49357f38 100644 --- a/src/include/catalog/pg_description.h +++ b/src/include/catalog/pg_description.h @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_description.h,v 1.14 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_description.h,v 1.15 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -83,4 +83,5 @@ typedef FormData_pg_description *Form_pg_description; * there is no initialization here. The initial contents are extracted * by genbki.sh and loaded during initdb. */ + #endif /* PG_DESCRIPTION_H */ diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h index 1c4ef4e97fb..f66cecc5ccc 100644 --- a/src/include/catalog/pg_group.h +++ b/src/include/catalog/pg_group.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_group.h,v 1.11 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_group.h,v 1.12 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -40,4 +40,5 @@ typedef FormData_pg_group *Form_pg_group; #define Anum_pg_group_groname 1 #define Anum_pg_group_grosysid 2 #define Anum_pg_group_grolist 3 + #endif /* PG_GROUP_H */ diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index 3a0a60ffd6d..0dc7c0c0d25 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_index.h,v 1.25 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_index.h,v 1.26 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -71,4 +71,5 @@ typedef FormData_pg_index *Form_pg_index; #define Anum_pg_index_indisprimary 8 #define Anum_pg_index_indreference 9 #define Anum_pg_index_indpred 10 + #endif /* PG_INDEX_H */ diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h index 2369e15ff29..54a3c4eca2c 100644 --- a/src/include/catalog/pg_largeobject.h +++ b/src/include/catalog/pg_largeobject.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_largeobject.h,v 1.10 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_largeobject.h,v 1.11 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -58,4 +58,5 @@ typedef FormData_pg_largeobject *Form_pg_largeobject; extern void LargeObjectCreate(Oid loid); extern void LargeObjectDrop(Oid loid); extern bool LargeObjectExists(Oid loid); + #endif /* PG_LARGEOBJECT_H */ diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index b8e4625c153..7832b924259 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -26,7 +26,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_opclass.h,v 1.41 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_opclass.h,v 1.42 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -136,4 +136,5 @@ DATA(insert OID = 2003 ( 403 varchar_ops 1043 t 0 )); DATA(insert OID = 2004 ( 405 varchar_ops 1043 t 0 )); DATA(insert OID = 2039 ( 403 timestamp_ops 1114 t 0 )); DATA(insert OID = 2040 ( 405 timestamp_ops 1114 t 0 )); + #endif /* PG_OPCLASS_H */ diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 8966c1f3205..45ed8f0ae05 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.97 2001/10/25 05:49:57 momjian Exp $ + * $Id: pg_operator.h,v 1.98 2001/10/28 06:26:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -856,4 +856,5 @@ extern void OperatorCreate(char *operatorName, bool canHash, char *leftSortName, char *rightSortName); + #endif /* PG_OPERATOR_H */ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index a504206ba49..82504373539 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.219 2001/10/25 14:10:06 tgl Exp $ + * $Id: pg_proc.h,v 1.220 2001/10/28 06:26:04 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -2888,4 +2888,5 @@ extern Oid ProcedureCreate(char *procedureName, int32 percall_cpu, int32 outin_ratio, List *argList); + #endif /* PG_PROC_H */ diff --git a/src/include/catalog/pg_relcheck.h b/src/include/catalog/pg_relcheck.h index 6ec5addb807..86268f578e9 100644 --- a/src/include/catalog/pg_relcheck.h +++ b/src/include/catalog/pg_relcheck.h @@ -51,4 +51,5 @@ typedef FormData_pg_relcheck *Form_pg_relcheck; #define Anum_pg_relcheck_rcname 2 #define Anum_pg_relcheck_rcbin 3 #define Anum_pg_relcheck_rcsrc 4 + #endif /* PG_RELCHECK_H */ diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h index 5870ed4e83f..7fac72b00f5 100644 --- a/src/include/catalog/pg_rewrite.h +++ b/src/include/catalog/pg_rewrite.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_rewrite.h,v 1.15 2001/10/25 05:49:58 momjian Exp $ + * $Id: pg_rewrite.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -63,4 +63,5 @@ typedef FormData_pg_rewrite *Form_pg_rewrite; #define Anum_pg_rewrite_is_instead 5 #define Anum_pg_rewrite_ev_qual 6 #define Anum_pg_rewrite_ev_action 7 + #endif /* PG_REWRITE_H */ diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h index 8198b2a44ad..a0a95d8c3b8 100644 --- a/src/include/catalog/pg_shadow.h +++ b/src/include/catalog/pg_shadow.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_shadow.h,v 1.15 2001/10/25 05:49:58 momjian Exp $ + * $Id: pg_shadow.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -72,4 +72,5 @@ typedef FormData_pg_shadow *Form_pg_shadow; DATA(insert ( "POSTGRES" PGUID t t t t _null_ _null_ )); #define BOOTSTRAP_USESYSID 1 + #endif /* PG_SHADOW_H */ diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h index 920e29c4396..25e56bbdbcd 100644 --- a/src/include/catalog/pg_statistic.h +++ b/src/include/catalog/pg_statistic.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_statistic.h,v 1.13 2001/10/25 05:49:58 momjian Exp $ + * $Id: pg_statistic.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -205,4 +205,5 @@ typedef FormData_pg_statistic *Form_pg_statistic; * their actual tuple positions. The coefficient ranges from +1 to -1. */ #define STATISTIC_KIND_CORRELATION 3 + #endif /* PG_STATISTIC_H */ diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h index b63fe7d2693..220c32f1198 100644 --- a/src/include/catalog/pg_trigger.h +++ b/src/include/catalog/pg_trigger.h @@ -92,4 +92,5 @@ typedef FormData_pg_trigger *Form_pg_trigger; #define TRIGGER_FOR_INSERT(type) (type & TRIGGER_TYPE_INSERT) #define TRIGGER_FOR_DELETE(type) (type & TRIGGER_TYPE_DELETE) #define TRIGGER_FOR_UPDATE(type) (type & TRIGGER_TYPE_UPDATE) + #endif /* PG_TRIGGER_H */ diff --git a/src/include/commands/async.h b/src/include/commands/async.h index ccc6a3636bd..3b9fc3c75f2 100644 --- a/src/include/commands/async.h +++ b/src/include/commands/async.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: async.h,v 1.18 2001/10/25 05:49:58 momjian Exp $ + * $Id: async.h,v 1.19 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,5 @@ extern void Async_NotifyHandler(SIGNAL_ARGS); */ extern void EnableNotifyInterrupt(void); extern void DisableNotifyInterrupt(void); + #endif /* ASYNC_H */ diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h index cafb18ff54d..e832b880d7a 100644 --- a/src/include/commands/cluster.h +++ b/src/include/commands/cluster.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Id: cluster.h,v 1.10 2001/10/25 05:49:58 momjian Exp $ + * $Id: cluster.h,v 1.11 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,5 @@ * functions */ extern void cluster(char *oldrelname, char *oldindexname); + #endif /* CLUSTER_H */ diff --git a/src/include/commands/command.h b/src/include/commands/command.h index 95530fda35a..ef9aa86ee97 100644 --- a/src/include/commands/command.h +++ b/src/include/commands/command.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: command.h,v 1.29 2001/10/25 05:49:58 momjian Exp $ + * $Id: command.h,v 1.30 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,4 +71,5 @@ extern void AlterTableOwner(const char *relationName, const char *newOwnerName); * LOCK */ extern void LockTableCommand(LockStmt *lockstmt); + #endif /* COMMAND_H */ diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h index 410c6dc7f68..371f918b6e8 100644 --- a/src/include/commands/comment.h +++ b/src/include/commands/comment.h @@ -31,4 +31,5 @@ extern void CommentObject(int objtype, char *objname, char *objproperty, extern void DeleteComments(Oid oid, Oid classoid); extern void CreateComments(Oid oid, Oid classoid, int32 subid, char *comment); + #endif /* COMMENT_H */ diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index 04ca68668df..19aced3e6af 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: copy.h,v 1.14 2001/10/25 05:49:58 momjian Exp $ + * $Id: copy.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,5 @@ extern int copy_lineno; void DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe, char *filename, char *delim, char *null_print); + #endif /* COPY_H */ diff --git a/src/include/commands/creatinh.h b/src/include/commands/creatinh.h index fd1db12fd95..2b4cf731011 100644 --- a/src/include/commands/creatinh.h +++ b/src/include/commands/creatinh.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: creatinh.h,v 1.15 2001/10/25 05:49:58 momjian Exp $ + * $Id: creatinh.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,5 @@ extern void DefineRelation(CreateStmt *stmt, char relkind); extern void RemoveRelation(char *name); extern void TruncateRelation(char *name); + #endif /* CREATINH_H */ diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index 3489b9d2792..bb8f2828c9d 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dbcommands.h,v 1.17 2001/10/25 05:49:58 momjian Exp $ + * $Id: dbcommands.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ extern void createdb(const char *dbname, const char *dbpath, const char *dbtemplate, int encoding); extern void dropdb(const char *dbname); + #endif /* DBCOMMANDS_H */ diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 52b760a4bf8..9b83f2f0253 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: defrem.h,v 1.26 2001/10/25 05:49:58 momjian Exp $ + * $Id: defrem.h,v 1.27 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,4 +48,5 @@ extern void RemoveOperator(char *operatorName, char *typeName1, char *typeName2); extern void RemoveType(char *typeName); extern void RemoveAggregate(char *aggName, char *aggType); + #endif /* DEFREM_H */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 013ae16596e..f52b75641ea 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Id: explain.h,v 1.13 2001/10/25 05:49:58 momjian Exp $ + * $Id: explain.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "tcop/dest.h" extern void ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest); + #endif /* EXPLAIN_H */ diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h index 29dcb32a127..42276055e6c 100644 --- a/src/include/commands/proclang.h +++ b/src/include/commands/proclang.h @@ -13,4 +13,5 @@ extern void CreateProceduralLanguage(CreatePLangStmt *stmt); extern void DropProceduralLanguage(DropPLangStmt *stmt); + #endif /* PROCLANG_H */ diff --git a/src/include/commands/rename.h b/src/include/commands/rename.h index 18b6d1e2bb7..6717c47453f 100644 --- a/src/include/commands/rename.h +++ b/src/include/commands/rename.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rename.h,v 1.11 2001/10/25 05:49:58 momjian Exp $ + * $Id: rename.h,v 1.12 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void renameatt(char *relname, extern void renamerel(const char *oldrelname, const char *newrelname); + #endif /* RENAME_H */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index a128491212b..4b7a73b377f 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sequence.h,v 1.17 2001/10/25 05:49:58 momjian Exp $ + * $Id: sequence.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,4 +89,5 @@ extern void CloseSequences(void); extern void seq_redo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_undo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_desc(char *buf, uint8 xl_info, char *rec); + #endif /* SEQUENCE_H */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index 6ab58804132..c24fff9d2f6 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: trigger.h,v 1.28 2001/10/25 05:49:58 momjian Exp $ + * $Id: trigger.h,v 1.29 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -160,4 +160,5 @@ extern void DeferredTriggerSetState(ConstraintsSetStmt *stmt); * */ extern bool RI_FKey_keyequal_upd(TriggerData *trigdata); + #endif /* TRIGGER_H */ diff --git a/src/include/commands/user.h b/src/include/commands/user.h index 080c8f0c785..03e8fc6e266 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -3,7 +3,7 @@ * user.h * * - * $Id: user.h,v 1.14 2001/10/25 05:49:58 momjian Exp $ + * $Id: user.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void AlterGroup(AlterGroupStmt *stmt, const char *tag); extern void DropGroup(DropGroupStmt *stmt); extern Datum update_pg_pwd(PG_FUNCTION_ARGS); + #endif /* USER_H */ diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index ed873c86402..b575f79e994 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: vacuum.h,v 1.41 2001/10/25 05:49:58 momjian Exp $ + * $Id: vacuum.h,v 1.42 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,4 +56,5 @@ extern void lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt); /* in commands/analyze.c */ extern void analyze_rel(Oid relid, VacuumStmt *vacstmt); + #endif /* VACUUM_H */ diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h index c1eb655d9da..6ab15a43a36 100644 --- a/src/include/commands/variable.h +++ b/src/include/commands/variable.h @@ -2,7 +2,7 @@ * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var' * statements * - * $Id: variable.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: variable.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * */ #ifndef VARIABLE_H @@ -14,4 +14,5 @@ extern void ResetPGVariable(const char *name); extern void set_default_datestyle(void); extern void set_default_client_encoding(void); + #endif /* VARIABLE_H */ diff --git a/src/include/commands/version.h b/src/include/commands/version.h index 18e9a3b2f38..dedd5cfa458 100644 --- a/src/include/commands/version.h +++ b/src/include/commands/version.h @@ -7,10 +7,11 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: version.h,v 1.10 2001/10/25 05:49:59 momjian Exp $ + * $Id: version.h,v 1.11 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef VERSION_H #define VERSION_H + #endif /* VERSION_H */ diff --git a/src/include/commands/view.h b/src/include/commands/view.h index d75464ec09d..74c21b80e51 100644 --- a/src/include/commands/view.h +++ b/src/include/commands/view.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: view.h,v 1.11 2001/10/25 05:49:59 momjian Exp $ + * $Id: view.h,v 1.12 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,5 @@ extern void DefineView(char *view_name, Query *view_parse); extern void RemoveView(char *view_name); + #endif /* VIEW_H */ diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h index 92ca247d29e..45e4f76b351 100644 --- a/src/include/executor/execdebug.h +++ b/src/include/executor/execdebug.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdebug.h,v 1.17 2001/10/25 05:49:59 momjian Exp $ + * $Id: execdebug.h,v 1.18 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -297,4 +297,5 @@ extern int NIndexTupleInserted; extern long NDirectFileRead; extern long NDirectFileWrite; + #endif /* ExecDebugIncluded */ diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h index 857e3db2c82..0a5fb38f18b 100644 --- a/src/include/executor/execdefs.h +++ b/src/include/executor/execdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdefs.h,v 1.9 2001/10/25 05:49:59 momjian Exp $ + * $Id: execdefs.h,v 1.10 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,4 +50,5 @@ #define EXEC_MJ_SKIPINNER_ADVANCE 13 #define EXEC_MJ_ENDOUTER 14 #define EXEC_MJ_ENDINNER 15 + #endif /* EXECDEFS_H */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 4232f6d2b46..297de04846d 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: execdesc.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,5 @@ typedef struct QueryDesc /* in pquery.c */ extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, CommandDest dest); + #endif /* EXECDESC_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 05f31e10b55..c47fec77ae0 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.59 2001/10/25 05:49:59 momjian Exp $ + * $Id: executor.h,v 1.60 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -177,4 +177,5 @@ extern void ExecOpenIndices(ResultRelInfo *resultRelInfo); extern void ExecCloseIndices(ResultRelInfo *resultRelInfo); extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, EState *estate, bool is_update); + #endif /* EXECUTOR_H */ diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index dc98d50f2c0..f436f06e381 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.16 2001/10/25 05:49:59 momjian Exp $ + * $Id: functions.h,v 1.17 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "fmgr.h" extern Datum fmgr_sql(PG_FUNCTION_ARGS); + #endif /* FUNCTIONS_H */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 9f8b7417947..d573a5ef47d 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.23 2001/10/25 05:49:59 momjian Exp $ + * $Id: hashjoin.h,v 1.24 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -92,4 +92,5 @@ typedef struct HashTableData } HashTableData; typedef HashTableData *HashJoinTable; + #endif /* HASHJOIN_H */ diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h index 152d5444a78..dbbc03fa8be 100644 --- a/src/include/executor/instrument.h +++ b/src/include/executor/instrument.h @@ -6,7 +6,7 @@ * * Copyright (c) 2001, PostgreSQL Global Development Group * - * $Id: instrument.h,v 1.2 2001/10/25 05:49:59 momjian Exp $ + * $Id: instrument.h,v 1.3 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,5 @@ extern Instrumentation *InstrAlloc(void); extern void InstrStartNode(Instrumentation *instr); extern void InstrStopNode(Instrumentation *instr, bool returnedTuple); extern void InstrEndLoop(Instrumentation *instr); + #endif /* INSTRUMENT_H */ diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 90643c58ccd..e016005f8e5 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAgg.h,v 1.13 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeAgg.h,v 1.14 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitAgg(Agg *node, EState *estate, Plan *parent); extern int ExecCountSlotsAgg(Agg *node); extern void ExecEndAgg(Agg *node); extern void ExecReScanAgg(Agg *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEAGG_H */ diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index 3cd54021a55..60f0f0a0a88 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAppend.h,v 1.14 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeAppend.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern int ExecCountSlotsAppend(Append *node); extern TupleTableSlot *ExecProcAppend(Append *node); extern void ExecEndAppend(Append *node); extern void ExecReScanAppend(Append *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEAPPEND_H */ diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index ed6fe7ab0ff..5ec7de171d4 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.19 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeGroup.h,v 1.20 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern bool execTuplesMatch(HeapTuple tuple1, extern FmgrInfo *execTuplesMatchPrepare(TupleDesc tupdesc, int numCols, AttrNumber *matchColIdx); + #endif /* NODEGROUP_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 731208905d2..18d316fd16a 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.21 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeHash.h,v 1.22 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,5 @@ extern void ExecChooseHashTableSize(double ntuples, int tupwidth, int *virtualbuckets, int *physicalbuckets, int *numbatches); + #endif /* NODEHASH_H */ diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index f3e04b3df1f..4ebfea08119 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.20 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.21 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,5 @@ extern int ExecCountSlotsHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node); extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile *file); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEHASHJOIN_H */ diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index bae08bd0461..656e1f2ff34 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeIndexscan.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeIndexscan.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,5 @@ extern void ExecUpdateIndexScanKeys(IndexScan *node, ExprContext *econtext); extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsIndexScan(IndexScan *node); extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEINDEXSCAN_H */ diff --git a/src/include/executor/nodeLimit.h b/src/include/executor/nodeLimit.h index 6b0acd4baa0..ab9224e1a35 100644 --- a/src/include/executor/nodeLimit.h +++ b/src/include/executor/nodeLimit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeLimit.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeLimit.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitLimit(Limit *node, EState *estate, Plan *parent); extern int ExecCountSlotsLimit(Limit *node); extern void ExecEndLimit(Limit *node); extern void ExecReScanLimit(Limit *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODELIMIT_H */ diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index e8e23dfeaa5..9392d536c96 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeMaterial.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ExecEndMaterial(Material *node); extern void ExecMaterialMarkPos(Material *node); extern void ExecMaterialRestrPos(Material *node); extern void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 94c4ef302e8..49ad0804a00 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMergejoin.h,v 1.14 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeMergejoin.h,v 1.15 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent); extern int ExecCountSlotsMergeJoin(MergeJoin *node); extern void ExecEndMergeJoin(MergeJoin *node); extern void ExecReScanMergeJoin(MergeJoin *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEMERGEJOIN_H; */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index 7f0ae110243..9d72a115fab 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeNestloop.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeNestloop.h,v 1.16 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,5 @@ extern int ExecCountSlotsNestLoop(NestLoop *node); extern void ExecEndNestLoop(NestLoop *node); extern void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODENESTLOOP_H */ diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index 7ee4fb712bc..ba33e94a303 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeResult.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeResult.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitResult(Result *node, EState *estate, Plan *parent); extern int ExecCountSlotsResult(Result *node); extern void ExecEndResult(Result *node); extern void ExecReScanResult(Result *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODERESULT_H */ diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index b0ebbc325b7..4994de6a235 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ExecEndSeqScan(SeqScan *node); extern void ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent); extern void ExecSeqMarkPos(SeqScan *node); extern void ExecSeqRestrPos(SeqScan *node); + #endif /* NODESEQSCAN_H */ diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h index 86ac187cbf0..0deb0cecc3a 100644 --- a/src/include/executor/nodeSetOp.h +++ b/src/include/executor/nodeSetOp.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSetOp.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeSetOp.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitSetOp(SetOp *node, EState *estate, Plan *parent); extern int ExecCountSlotsSetOp(SetOp *node); extern void ExecEndSetOp(SetOp *node); extern void ExecReScanSetOp(SetOp *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODESETOP_H */ diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index a667f9bb347..b1a76d69abf 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSort.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeSort.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ExecEndSort(Sort *node); extern void ExecSortMarkPos(Sort *node); extern void ExecSortRestrPos(Sort *node); extern void ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODESORT_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index 0b12f3d61d2..f7c46c3ca92 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -15,4 +15,5 @@ extern bool ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent); extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent); extern void ExecSetParamPlan(SubPlan *node, ExprContext *econtext); extern void ExecEndSubPlan(SubPlan *node); + #endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h index acbc98aa54a..aebe249d590 100644 --- a/src/include/executor/nodeSubqueryscan.h +++ b/src/include/executor/nodeSubqueryscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSubqueryscan.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeSubqueryscan.h,v 1.4 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void ExecEndSubqueryScan(SubqueryScan *node); extern bool ExecInitSubqueryScan(SubqueryScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsSubqueryScan(SubqueryScan *node); extern void ExecSubqueryReScan(SubqueryScan *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODESUBQUERYSCAN_H */ diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h index c9cd06b141f..d24ee7689c0 100644 --- a/src/include/executor/nodeTidscan.h +++ b/src/include/executor/nodeTidscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeTidscan.h,v 1.6 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeTidscan.h,v 1.7 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ExecTidMarkPos(TidScan *node); extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsTidScan(TidScan *node); extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODETIDSCAN_H */ diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index 40fc0d29554..5e358654e05 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeUnique.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ + * $Id: nodeUnique.h,v 1.13 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern bool ExecInitUnique(Unique *node, EState *estate, Plan *parent); extern int ExecCountSlotsUnique(Unique *node); extern void ExecEndUnique(Unique *node); extern void ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent); + #endif /* NODEUNIQUE_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 26531a49fc1..282063d892d 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -2,7 +2,7 @@ * * spi.h * - * $Id: spi.h,v 1.29 2001/10/25 05:49:59 momjian Exp $ + * $Id: spi.h,v 1.30 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -112,4 +112,5 @@ extern void SPI_cursor_move(Portal portal, bool forward, int count); extern void SPI_cursor_close(Portal portal); extern void AtEOXact_SPI(void); + #endif /* SPI_H */ diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index d7f036506b0..a710a3b73ff 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -3,7 +3,7 @@ * spi.c * Server Programming Interface private declarations * - * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.9 2001/10/25 05:49:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.10 2001/10/28 06:26:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,5 @@ typedef struct #define _SPI_CPLAN_CURCXT 0 #define _SPI_CPLAN_PROCXT 1 #define _SPI_CPLAN_TOPCXT 2 + #endif /* SPI_PRIV_H */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 06f1387fe90..d241457d71b 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuptable.h,v 1.19 2001/10/25 05:49:59 momjian Exp $ + * $Id: tuptable.h,v 1.20 2001/10/28 06:26:06 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -80,4 +80,5 @@ typedef struct TupleTableData } TupleTableData; typedef TupleTableData *TupleTable; + #endif /* TUPTABLE_H */ diff --git a/src/include/fmgr.h b/src/include/fmgr.h index c50e4cdff62..6e2084ed440 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fmgr.h,v 1.16 2001/10/25 05:49:54 momjian Exp $ + * $Id: fmgr.h,v 1.17 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -383,4 +383,5 @@ extern void load_file(char *filename); * DEPRECATED, DO NOT USE IN NEW CODE */ extern char *fmgr(Oid procedureId,...); + #endif /* FMGR_H */ diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h index 61335920790..01970575e58 100644 --- a/src/include/lib/dllist.h +++ b/src/include/lib/dllist.h @@ -34,7 +34,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dllist.h,v 1.17 2001/10/25 05:49:59 momjian Exp $ + * $Id: dllist.h,v 1.18 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,7 +66,7 @@ extern void DLFreeList(Dllist *list); /* free up a list and all the extern Dlelem *DLNewElem(void *val); extern void DLInitElem(Dlelem *e, void *val); extern void DLFreeElem(Dlelem *e); -extern void DLRemove(Dlelem *e); /* removes node from list */ +extern void DLRemove(Dlelem *e); /* removes node from list */ extern void DLAddHead(Dllist *list, Dlelem *node); extern void DLAddTail(Dllist *list, Dlelem *node); extern Dlelem *DLRemHead(Dllist *list); /* remove and return the head */ @@ -81,4 +81,5 @@ extern void DLMoveToFront(Dlelem *e); /* move node to front of its list */ #define DLGetListHdr(elem) ((elem)->dle_list) #define DLE_VAL(elem) ((elem)->dle_val) + #endif /* DLLIST_H */ diff --git a/src/include/lib/lispsort.h b/src/include/lib/lispsort.h index 13228cfd2a0..99c7cec3083 100644 --- a/src/include/lib/lispsort.h +++ b/src/include/lib/lispsort.h @@ -7,10 +7,11 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lispsort.h,v 1.8 2001/10/25 05:49:59 momjian Exp $ + * $Id: lispsort.h,v 1.9 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef LISPSORT_H #define LISPSORT_H + #endif /* LISPSORT_H */ diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index fc6e2031a9f..f2935e53e7f 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: stringinfo.h,v 1.21 2001/10/25 05:49:59 momjian Exp $ + * $Id: stringinfo.h,v 1.22 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -110,4 +110,5 @@ extern void appendStringInfoChar(StringInfo str, char ch); */ extern void appendBinaryStringInfo(StringInfo str, const char *data, int datalen); + #endif /* STRINGINFO_H */ diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index 0ef455a8825..c679f7dd6f6 100644 --- a/src/include/libpq/auth.h +++ b/src/include/libpq/auth.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: auth.h,v 1.18 2001/10/25 05:49:59 momjian Exp $ + * $Id: auth.h,v 1.19 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ void ClientAuthentication(Port *port); #define PG_KRB5_VERSION "PGVER5.1" extern char *pg_krb_server_keyfile; + #endif /* AUTH_H */ diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index e53b60a3d8f..08f2c634add 100644 --- a/src/include/libpq/be-fsstubs.h +++ b/src/include/libpq/be-fsstubs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: be-fsstubs.h,v 1.13 2001/10/25 05:49:59 momjian Exp $ + * $Id: be-fsstubs.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,4 +46,5 @@ extern int lo_write(int fd, char *buf, int len); * Cleanup LOs at xact commit/abort [ Pascal Andr� <[email protected]> ] */ extern void lo_commit(bool isCommit); + #endif /* BE_FSSTUBS_H */ diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index 4f91e207fd0..39d677e166b 100644 --- a/src/include/libpq/crypt.h +++ b/src/include/libpq/crypt.h @@ -33,4 +33,5 @@ extern bool EncryptMD5(const char *passwd, const char *salt, #define isMD5(passwd) (strncmp((passwd),"md5",3) == 0 && \ strlen(passwd) == MD5_PASSWD_LEN) + #endif diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index f29e2a72541..e38889aecb0 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -4,7 +4,7 @@ * Interface to hba.c * * - * $Id: hba.h,v 1.29 2001/10/25 05:49:59 momjian Exp $ + * $Id: hba.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,16 +31,16 @@ typedef enum UserAuth { - uaReject, - uaKrb4, - uaKrb5, - uaTrust, - uaIdent, - uaPassword, - uaCrypt, - uaMD5 + uaReject, + uaKrb4, + uaKrb5, + uaTrust, + uaIdent, + uaPassword, + uaCrypt, + uaMD5 #ifdef USE_PAM - ,uaPAM + ,uaPAM #endif /* USE_PAM */ } UserAuth; @@ -49,4 +49,5 @@ typedef struct Port hbaPort; extern int hba_getauthmethod(hbaPort *port); extern int authident(hbaPort *port); extern void load_hba_and_ident(void); + #endif diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 729c1c36362..13af1594334 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.23 2001/10/25 05:49:59 momjian Exp $ + * $Id: libpq-be.h,v 1.24 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,10 +67,10 @@ typedef struct AuthRequestPacket typedef enum { - Idle, - ReadingPacketLength, - ReadingPacket, - WritingPacket + Idle, + ReadingPacketLength, + ReadingPacket, + WritingPacket } PacketState; typedef int (*PacketDoneProc) (void *arg, PacketLen pktlen, void *pktdata); @@ -155,4 +155,5 @@ int PacketReceiveFragment(Port *port); void PacketSendSetup(Packet *pkt, int nbytes, PacketDoneProc iodone, void *arg); int PacketSendFragment(Port *port); void PacketSendError(Packet *pkt, char *errormsg); + #endif /* LIBPQ_BE_H */ diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h index 39b0291981a..6870ada29a4 100644 --- a/src/include/libpq/libpq-fs.h +++ b/src/include/libpq/libpq-fs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fs.h,v 1.13 2001/10/25 05:49:59 momjian Exp $ + * $Id: libpq-fs.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ #define INV_WRITE 0x00020000 #define INV_READ 0x00040000 + #endif /* LIBPQ_FS_H */ diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index 685eb4a7c06..aa30d2f3a0d 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.46 2001/10/25 05:49:59 momjian Exp $ + * $Id: libpq.h,v 1.47 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,4 +76,5 @@ extern void pq_endcopyout(bool errorAbort); extern void pqdebug(char *fmt, char *msg); extern void PQtrace(void); extern void PQuntrace(void); + #endif /* LIBPQ_H */ diff --git a/src/include/libpq/password.h b/src/include/libpq/password.h index 8eaf643eb17..c704edeb345 100644 --- a/src/include/libpq/password.h +++ b/src/include/libpq/password.h @@ -2,4 +2,5 @@ #define PASSWORD_H int verify_password(const Port *port, const char *user, const char *password); + #endif diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h index 61e88c881cd..6505a30d600 100644 --- a/src/include/libpq/pqformat.h +++ b/src/include/libpq/pqformat.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqformat.h,v 1.9 2001/10/25 05:49:59 momjian Exp $ + * $Id: pqformat.h,v 1.10 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ extern int pq_puttextmessage(char msgtype, const char *str); extern int pq_getint(int *result, int b); extern int pq_getstr(StringInfo s); + #endif /* PQFORMAT_H */ diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h index efecb9cc4cc..065faf8c536 100644 --- a/src/include/libpq/pqsignal.h +++ b/src/include/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqsignal.h,v 1.17 2001/10/25 05:49:59 momjian Exp $ + * $Id: pqsignal.h,v 1.18 2001/10/28 06:26:07 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -38,4 +38,5 @@ typedef void (*pqsigfunc) (int); extern void pqinitmask(void); extern pqsigfunc pqsignal(int signo, pqsigfunc func); + #endif /* PQSIGNAL_H */ diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index d6d8af82cd1..97094c0e006 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,4 +1,4 @@ -/* $Id: pg_wchar.h,v 1.35 2001/10/25 05:49:59 momjian Exp $ */ +/* $Id: pg_wchar.h,v 1.36 2001/10/28 06:26:07 momjian Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H @@ -88,7 +88,7 @@ typedef unsigned int pg_wchar; * Official multibyte byte encodings (0x90-0x99) * 0x9a-0x9d are free. 0x9e and 0x9f are reserved. */ -#define LC_JISX0208_1978 0x90/* Japanese Kanji, old JIS (not supported) */ +#define LC_JISX0208_1978 0x90 /* Japanese Kanji, old JIS (not supported) */ /* #define FREE 0x90 free (unused) */ #define LC_GB2312_80 0x91 /* Chinese */ #define LC_JISX0208 0x92 /* Japanese Kanji (JIS X 0208) */ @@ -114,20 +114,20 @@ typedef unsigned int pg_wchar; #define LC_VISCII_UPPER 0xa3 /* Vietnamese VISCII1.1 upper-case (not * supported) */ #define LC_ARABIC_DIGIT 0xa4 /* Arabic digit (not supported) */ -#define LC_ARABIC_1_COLUMN 0xa5/* Arabic 1-column (not supported) */ +#define LC_ARABIC_1_COLUMN 0xa5 /* Arabic 1-column (not supported) */ #define LC_ASCII_RIGHT_TO_LEFT 0xa6 /* ASCII (left half of ISO8859-1) * with right-to-left direction * (not supported) */ #define LC_LAO 0xa7 /* Lao characters (ISO10646 0E80..0EDF) * (not supported) */ -#define LC_ARABIC_2_COLUMN 0xa8/* Arabic 1-column (not supported) */ +#define LC_ARABIC_2_COLUMN 0xa8 /* Arabic 1-column (not supported) */ /* * Private multi byte encodings (0xf0-0xff) */ #define LC_INDIAN_1_COLUMN 0xf0/* Indian charset for 1-column width * glypps (not supported) */ -#define LC_TIBETAN_1_COLUMN 0xf1/* Tibetan 1 column glyph (not supported) */ +#define LC_TIBETAN_1_COLUMN 0xf1 /* Tibetan 1 column glyph (not supported) */ #define LC_ETHIOPIC 0xf5 /* Ethiopic characters (not supported) */ #define LC_CNS11643_3 0xf6 /* CNS 11643-1992 Plane 3 */ #define LC_CNS11643_4 0xf7 /* CNS 11643-1992 Plane 4 */ @@ -154,37 +154,37 @@ typedef unsigned int pg_wchar; */ typedef enum pg_enc { - PG_SQL_ASCII = 0, /* SQL/ASCII */ - PG_EUC_JP, /* EUC for Japanese */ - PG_EUC_CN, /* EUC for Chinese */ - PG_EUC_KR, /* EUC for Korean */ - PG_EUC_TW, /* EUC for Taiwan */ - PG_UTF8, /* Unicode UTF-8 */ - PG_MULE_INTERNAL, /* Mule internal code */ - PG_LATIN1, /* ISO-8859-1 Latin 1 */ - PG_LATIN2, /* ISO-8859-2 Latin 2 */ - PG_LATIN3, /* ISO-8859-3 Latin 3 */ - PG_LATIN4, /* ISO-8859-4 Latin 4 */ - PG_LATIN5, /* ISO-8859-9 Latin 5 */ - PG_LATIN6, /* ISO-8859-10 Latin6 */ - PG_LATIN7, /* ISO-8859-13 Latin7 */ - PG_LATIN8, /* ISO-8859-14 Latin8 */ - PG_LATIN9, /* ISO-8859-15 Latin9 */ - PG_LATIN10, /* ISO-8859-16 Latin10 */ - PG_KOI8R, /* KOI8-R */ - PG_WIN1251, /* windows-1251 (was: WIN) */ - PG_ALT, /* (MS-DOS CP866) */ - PG_ISO_8859_5, /* ISO-8859-5 */ - PG_ISO_8859_6, /* ISO-8859-6 */ - PG_ISO_8859_7, /* ISO-8859-7 */ - PG_ISO_8859_8, /* ISO-8859-8 */ + PG_SQL_ASCII = 0, /* SQL/ASCII */ + PG_EUC_JP, /* EUC for Japanese */ + PG_EUC_CN, /* EUC for Chinese */ + PG_EUC_KR, /* EUC for Korean */ + PG_EUC_TW, /* EUC for Taiwan */ + PG_UTF8, /* Unicode UTF-8 */ + PG_MULE_INTERNAL, /* Mule internal code */ + PG_LATIN1, /* ISO-8859-1 Latin 1 */ + PG_LATIN2, /* ISO-8859-2 Latin 2 */ + PG_LATIN3, /* ISO-8859-3 Latin 3 */ + PG_LATIN4, /* ISO-8859-4 Latin 4 */ + PG_LATIN5, /* ISO-8859-9 Latin 5 */ + PG_LATIN6, /* ISO-8859-10 Latin6 */ + PG_LATIN7, /* ISO-8859-13 Latin7 */ + PG_LATIN8, /* ISO-8859-14 Latin8 */ + PG_LATIN9, /* ISO-8859-15 Latin9 */ + PG_LATIN10, /* ISO-8859-16 Latin10 */ + PG_KOI8R, /* KOI8-R */ + PG_WIN1251, /* windows-1251 (was: WIN) */ + PG_ALT, /* (MS-DOS CP866) */ + PG_ISO_8859_5, /* ISO-8859-5 */ + PG_ISO_8859_6, /* ISO-8859-6 */ + PG_ISO_8859_7, /* ISO-8859-7 */ + PG_ISO_8859_8, /* ISO-8859-8 */ /* followings are for client encoding only */ - PG_SJIS, /* Shift JIS */ - PG_BIG5, /* Big5 */ - PG_WIN1250, /* windows-1250 */ + PG_SJIS, /* Shift JIS */ + PG_BIG5, /* Big5 */ + PG_WIN1250, /* windows-1250 */ - _PG_LAST_ENCODING_ /* mark only */ + _PG_LAST_ENCODING_ /* mark only */ } pg_enc; @@ -257,8 +257,8 @@ typedef struct pg_enconv { pg_enc encoding; /* encoding identifier */ to_mic_converter to_mic; /* client encoding to MIC */ - from_mic_converter from_mic; /* MIC to client encoding */ - to_mic_converter to_unicode; /* client encoding to UTF-8 */ + from_mic_converter from_mic; /* MIC to client encoding */ + to_mic_converter to_unicode; /* client encoding to UTF-8 */ from_mic_converter from_unicode; /* UTF-8 to client encoding */ } pg_enconv; @@ -346,4 +346,5 @@ extern unsigned short CNStoBIG5(unsigned short, unsigned char); char *pg_verifymbstr(const unsigned char *, int); #endif /* MULTIBYTE */ + #endif /* PG_WCHAR_H */ diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index b85784cdcab..ee8f69f04f9 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.95 2001/10/25 05:49:54 momjian Exp $ + * $Id: miscadmin.h,v 1.96 2001/10/28 06:25:59 momjian Exp $ * * NOTES * some of the information in this file should be moved to @@ -260,10 +260,9 @@ extern bool is_dbadmin(Oid dbid); /* current user is owner of typedef enum ProcessingMode { - BootstrapProcessing, /* bootstrap creation of template - * database */ - InitProcessing, /* initializing system */ - NormalProcessing/* normal processing */ + BootstrapProcessing, /* bootstrap creation of template database */ + InitProcessing, /* initializing system */ + NormalProcessing /* normal processing */ } ProcessingMode; extern ProcessingMode Mode; @@ -305,4 +304,5 @@ extern void ValidatePgVersion(const char *path); extern void IgnoreSystemIndexes(bool mode); extern bool IsIgnoringSystemIndexes(void); extern bool IsCacheInitialized(void); + #endif /* MISCADMIN_H */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 69f0597f81b..63b679da3d8 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.64 2001/10/25 05:50:01 momjian Exp $ + * $Id: execnodes.h,v 1.65 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -98,11 +98,9 @@ typedef struct ExprContext */ typedef enum { - ExprSingleResult, /* expression does not return a - * set */ - ExprMultipleResult, /* this result is an element of a - * set */ - ExprEndResult /* there are no more elements in the set */ + ExprSingleResult, /* expression does not return a set */ + ExprMultipleResult, /* this result is an element of a set */ + ExprEndResult /* there are no more elements in the set */ } ExprDoneCond; /* @@ -753,4 +751,5 @@ typedef struct TeeState tee_rightScanDesc; } TeeState; #endif + #endif /* EXECNODES_H */ diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 9a4dc6e734a..2887440be14 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.28 2001/10/25 05:50:04 momjian Exp $ + * $Id: makefuncs.h,v 1.29 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,4 +45,5 @@ extern Const *makeConst(Oid consttype, extern Const *makeNullConst(Oid consttype); extern Attr *makeAttr(char *relname, char *attname); + #endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index f26db840630..abf380bb60e 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeFuncs.h,v 1.14 2001/10/25 05:50:04 momjian Exp $ + * $Id: nodeFuncs.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern bool single_node(Node *node); extern bool var_is_outer(Var *var); extern bool var_is_rel(Var *var); extern Oper *replace_opid(Oper *oper); + #endif /* NODEFUNCS_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 66ca855f9aa..234d5afeae9 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.94 2001/10/25 05:50:04 momjian Exp $ + * $Id: nodes.h,v 1.95 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,211 +23,211 @@ */ typedef enum NodeTag { - T_Invalid = 0, + T_Invalid = 0, /* * TAGS FOR PLAN NODES (plannodes.h) */ - T_Plan = 10, - T_Result, - T_Append, - T_Scan, - T_SeqScan, - T_IndexScan, - T_Join, - T_NestLoop, - T_MergeJoin, - T_HashJoin, - T_Limit, - T_Material, - T_Sort, - T_Agg, - T_Unique, - T_Hash, - T_SetOp, - T_Group, - T_SubPlan, - T_TidScan, - T_SubqueryScan, + T_Plan = 10, + T_Result, + T_Append, + T_Scan, + T_SeqScan, + T_IndexScan, + T_Join, + T_NestLoop, + T_MergeJoin, + T_HashJoin, + T_Limit, + T_Material, + T_Sort, + T_Agg, + T_Unique, + T_Hash, + T_SetOp, + T_Group, + T_SubPlan, + T_TidScan, + T_SubqueryScan, /* * TAGS FOR PRIMITIVE NODES (primnodes.h) */ - T_Resdom = 100, - T_Fjoin, - T_Expr, - T_Var, - T_Oper, - T_Const, - T_Param, - T_Aggref, - T_SubLink, - T_Func, - T_FieldSelect, - T_ArrayRef, - T_Iter, - T_RelabelType, - T_RangeTblRef, - T_FromExpr, - T_JoinExpr, + T_Resdom = 100, + T_Fjoin, + T_Expr, + T_Var, + T_Oper, + T_Const, + T_Param, + T_Aggref, + T_SubLink, + T_Func, + T_FieldSelect, + T_ArrayRef, + T_Iter, + T_RelabelType, + T_RangeTblRef, + T_FromExpr, + T_JoinExpr, /* * TAGS FOR PLANNER NODES (relation.h) */ - T_RelOptInfo = 200, - T_Path, - T_IndexPath, - T_NestPath, - T_MergePath, - T_HashPath, - T_TidPath, - T_AppendPath, - T_PathKeyItem, - T_RestrictInfo, - T_JoinInfo, - T_Stream, - T_IndexOptInfo, + T_RelOptInfo = 200, + T_Path, + T_IndexPath, + T_NestPath, + T_MergePath, + T_HashPath, + T_TidPath, + T_AppendPath, + T_PathKeyItem, + T_RestrictInfo, + T_JoinInfo, + T_Stream, + T_IndexOptInfo, /* * TAGS FOR EXECUTOR NODES (execnodes.h) */ - T_IndexInfo = 300, - T_ResultRelInfo, - T_TupleCount, - T_TupleTableSlot, - T_ExprContext, - T_ProjectionInfo, - T_JunkFilter, - T_EState, - T_BaseNode, - T_CommonState, - T_ResultState, - T_AppendState, - T_CommonScanState, - T_ScanState, - T_IndexScanState, - T_JoinState, - T_NestLoopState, - T_MergeJoinState, - T_HashJoinState, - T_MaterialState, - T_AggState, - T_GroupState, - T_SortState, - T_UniqueState, - T_HashState, - T_TidScanState, - T_SubqueryScanState, - T_SetOpState, - T_LimitState, + T_IndexInfo = 300, + T_ResultRelInfo, + T_TupleCount, + T_TupleTableSlot, + T_ExprContext, + T_ProjectionInfo, + T_JunkFilter, + T_EState, + T_BaseNode, + T_CommonState, + T_ResultState, + T_AppendState, + T_CommonScanState, + T_ScanState, + T_IndexScanState, + T_JoinState, + T_NestLoopState, + T_MergeJoinState, + T_HashJoinState, + T_MaterialState, + T_AggState, + T_GroupState, + T_SortState, + T_UniqueState, + T_HashState, + T_TidScanState, + T_SubqueryScanState, + T_SetOpState, + T_LimitState, /* * TAGS FOR MEMORY NODES (memnodes.h) */ - T_MemoryContext = 400, - T_AllocSetContext, + T_MemoryContext = 400, + T_AllocSetContext, /* * TAGS FOR VALUE NODES (pg_list.h) */ - T_Value = 500, - T_List, - T_Integer, - T_Float, - T_String, - T_BitString, - T_Null, + T_Value = 500, + T_List, + T_Integer, + T_Float, + T_String, + T_BitString, + T_Null, /* * TAGS FOR PARSE TREE NODES (parsenodes.h) */ - T_Query = 600, - T_InsertStmt, - T_DeleteStmt, - T_UpdateStmt, - T_SelectStmt, - T_AlterTableStmt, - T_SetOperationStmt, - T_GrantStmt, - T_ClosePortalStmt, - T_ClusterStmt, - T_CopyStmt, - T_CreateStmt, - T_VersionStmt, - T_DefineStmt, - T_DropStmt, - T_TruncateStmt, - T_CommentStmt, - T_FetchStmt, - T_IndexStmt, - T_ProcedureStmt, - T_RemoveAggrStmt, - T_RemoveFuncStmt, - T_RemoveOperStmt, - T_RenameStmt, - T_RuleStmt, - T_NotifyStmt, - T_ListenStmt, - T_UnlistenStmt, - T_TransactionStmt, - T_ViewStmt, - T_LoadStmt, - T_CreatedbStmt, - T_DropdbStmt, - T_VacuumStmt, - T_ExplainStmt, - T_CreateSeqStmt, - T_VariableSetStmt, - T_VariableShowStmt, - T_VariableResetStmt, - T_CreateTrigStmt, - T_DropTrigStmt, - T_CreatePLangStmt, - T_DropPLangStmt, - T_CreateUserStmt, - T_AlterUserStmt, - T_DropUserStmt, - T_LockStmt, - T_ConstraintsSetStmt, - T_CreateGroupStmt, - T_AlterGroupStmt, - T_DropGroupStmt, - T_ReindexStmt, - T_CheckPointStmt, - - T_A_Expr = 700, - T_Attr, - T_A_Const, - T_ParamNo, - T_Ident, - T_FuncCall, - T_A_Indices, - T_ResTarget, - T_TypeCast, - T_RangeSubselect, - T_SortGroupBy, - T_RangeVar, - T_TypeName, - T_IndexElem, - T_ColumnDef, - T_Constraint, - T_DefElem, - T_TargetEntry, - T_RangeTblEntry, - T_SortClause, - T_GroupClause, - T_NullTest, - T_BooleanTest, - T_CaseExpr, - T_CaseWhen, - T_FkConstraint, - T_PrivGrantee, + T_Query = 600, + T_InsertStmt, + T_DeleteStmt, + T_UpdateStmt, + T_SelectStmt, + T_AlterTableStmt, + T_SetOperationStmt, + T_GrantStmt, + T_ClosePortalStmt, + T_ClusterStmt, + T_CopyStmt, + T_CreateStmt, + T_VersionStmt, + T_DefineStmt, + T_DropStmt, + T_TruncateStmt, + T_CommentStmt, + T_FetchStmt, + T_IndexStmt, + T_ProcedureStmt, + T_RemoveAggrStmt, + T_RemoveFuncStmt, + T_RemoveOperStmt, + T_RenameStmt, + T_RuleStmt, + T_NotifyStmt, + T_ListenStmt, + T_UnlistenStmt, + T_TransactionStmt, + T_ViewStmt, + T_LoadStmt, + T_CreatedbStmt, + T_DropdbStmt, + T_VacuumStmt, + T_ExplainStmt, + T_CreateSeqStmt, + T_VariableSetStmt, + T_VariableShowStmt, + T_VariableResetStmt, + T_CreateTrigStmt, + T_DropTrigStmt, + T_CreatePLangStmt, + T_DropPLangStmt, + T_CreateUserStmt, + T_AlterUserStmt, + T_DropUserStmt, + T_LockStmt, + T_ConstraintsSetStmt, + T_CreateGroupStmt, + T_AlterGroupStmt, + T_DropGroupStmt, + T_ReindexStmt, + T_CheckPointStmt, + + T_A_Expr = 700, + T_Attr, + T_A_Const, + T_ParamNo, + T_Ident, + T_FuncCall, + T_A_Indices, + T_ResTarget, + T_TypeCast, + T_RangeSubselect, + T_SortGroupBy, + T_RangeVar, + T_TypeName, + T_IndexElem, + T_ColumnDef, + T_Constraint, + T_DefElem, + T_TargetEntry, + T_RangeTblEntry, + T_SortClause, + T_GroupClause, + T_NullTest, + T_BooleanTest, + T_CaseExpr, + T_CaseWhen, + T_FkConstraint, + T_PrivGrantee, /* * TAGS FOR FUNCTION-CALL CONTEXT AND RESULTINFO NODES (see fmgr.h) */ - T_TriggerData = 800, /* in commands/trigger.h */ - T_ReturnSetInfo /* in nodes/execnodes.h */ + T_TriggerData = 800, /* in commands/trigger.h */ + T_ReturnSetInfo /* in nodes/execnodes.h */ } NodeTag; @@ -313,14 +313,14 @@ typedef double Cost; /* execution cost (in page-access units) */ */ typedef enum CmdType { - CMD_UNKNOWN, - CMD_SELECT, /* select stmt (formerly retrieve) */ - CMD_UPDATE, /* update stmt (formerly replace) */ - CMD_INSERT, /* insert stmt (formerly append) */ - CMD_DELETE, - CMD_UTILITY, /* cmds like create, destroy, copy, + CMD_UNKNOWN, + CMD_SELECT, /* select stmt (formerly retrieve) */ + CMD_UPDATE, /* update stmt (formerly replace) */ + CMD_INSERT, /* insert stmt (formerly append) */ + CMD_DELETE, + CMD_UTILITY, /* cmds like create, destroy, copy, * vacuum, etc. */ - CMD_NOTHING /* dummy command for instead nothing rules + CMD_NOTHING /* dummy command for instead nothing rules * with qual */ } CmdType; @@ -340,11 +340,11 @@ typedef enum JoinType /* * The canonical kinds of joins */ - JOIN_INNER, /* matching tuple pairs only */ - JOIN_LEFT, /* pairs + unmatched outer tuples */ - JOIN_FULL, /* pairs + unmatched outer + unmatched + JOIN_INNER, /* matching tuple pairs only */ + JOIN_LEFT, /* pairs + unmatched outer tuples */ + JOIN_FULL, /* pairs + unmatched outer + unmatched * inner */ - JOIN_RIGHT, /* pairs + unmatched inner tuples */ + JOIN_RIGHT, /* pairs + unmatched inner tuples */ /* * SQL92 considers UNION JOIN to be a kind of join, so list it here @@ -352,7 +352,7 @@ typedef enum JoinType * join in the executor. (The planner must convert it to an Append * plan.) */ - JOIN_UNION + JOIN_UNION /* * Eventually we will have some additional join types for efficient @@ -364,4 +364,5 @@ typedef enum JoinType ((jointype) == JOIN_LEFT || \ (jointype) == JOIN_FULL || \ (jointype) == JOIN_RIGHT) + #endif /* NODES_H */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 5c55d6cf35c..e15643806aa 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: params.h,v 1.14 2001/10/25 05:50:04 momjian Exp $ + * $Id: params.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,4 +99,5 @@ typedef struct ParamExecData Datum value; bool isnull; } ParamExecData; + #endif /* PARAMS_H */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 2458a543fb5..1abd7ba365a 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.148 2001/10/25 05:50:04 momjian Exp $ + * $Id: parsenodes.h,v 1.149 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,7 +79,7 @@ typedef struct Query * commit to the exact set of child tables at parse time. This field * ought to go in some sort of TopPlan plan node, not in the Query. */ - List *resultRelations; /* integer list of RT indexes, or NIL */ + List *resultRelations; /* integer list of RT indexes, or NIL */ /* internal to planner */ List *base_rel_list; /* list of base-relation RelOptInfos */ @@ -93,9 +93,9 @@ typedef struct Query typedef enum InhOption { - INH_NO, /* Do NOT scan child tables */ - INH_YES, /* DO scan child tables */ - INH_DEFAULT /* Use current SQL_inheritance option */ + INH_NO, /* Do NOT scan child tables */ + INH_YES, /* DO scan child tables */ + INH_DEFAULT /* Use current SQL_inheritance option */ } InhOption; /***************************************************************************** @@ -228,18 +228,17 @@ typedef struct CreateStmt typedef enum ConstrType /* types of constraints */ { - CONSTR_NULL, /* not SQL92, but a lot of people expect + CONSTR_NULL, /* not SQL92, but a lot of people expect * it */ - CONSTR_NOTNULL, - CONSTR_DEFAULT, - CONSTR_CHECK, - CONSTR_PRIMARY, - CONSTR_UNIQUE, - CONSTR_ATTR_DEFERRABLE, /* attributes for previous - * constraint node */ - CONSTR_ATTR_NOT_DEFERRABLE, - CONSTR_ATTR_DEFERRED, - CONSTR_ATTR_IMMEDIATE + CONSTR_NOTNULL, + CONSTR_DEFAULT, + CONSTR_CHECK, + CONSTR_PRIMARY, + CONSTR_UNIQUE, + CONSTR_ATTR_DEFERRABLE, /* attributes for previous constraint node */ + CONSTR_ATTR_NOT_DEFERRABLE, + CONSTR_ATTR_DEFERRED, + CONSTR_ATTR_IMMEDIATE } ConstrType; typedef struct Constraint @@ -864,10 +863,10 @@ typedef struct UpdateStmt */ typedef enum SetOperation { - SETOP_NONE = 0, - SETOP_UNION, - SETOP_INTERSECT, - SETOP_EXCEPT + SETOP_NONE = 0, + SETOP_UNION, + SETOP_INTERSECT, + SETOP_EXCEPT } SetOperation; typedef struct SelectStmt @@ -1054,7 +1053,7 @@ typedef struct CaseWhen typedef enum NullTestType { - IS_NULL, IS_NOT_NULL + IS_NULL, IS_NOT_NULL } NullTestType; typedef struct NullTest @@ -1076,7 +1075,7 @@ typedef struct NullTest typedef enum BoolTestType { - IS_TRUE, IS_NOT_TRUE, IS_FALSE, IS_NOT_FALSE, IS_UNKNOWN, IS_NOT_UNKNOWN + IS_TRUE, IS_NOT_TRUE, IS_FALSE, IS_NOT_FALSE, IS_UNKNOWN, IS_NOT_UNKNOWN } BoolTestType; typedef struct BooleanTest @@ -1341,7 +1340,7 @@ typedef struct RangeTblEntry typedef struct SortClause { NodeTag type; - Index tleSortGroupRef; /* reference into targetlist */ + Index tleSortGroupRef; /* reference into targetlist */ Oid sortop; /* the sort operator to use */ } SortClause; @@ -1354,4 +1353,5 @@ typedef struct SortClause * nodetags...). We have routines that operate interchangeably on both. */ typedef SortClause GroupClause; + #endif /* PARSENODES_H */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index db303e2da80..20792b2d407 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.24 2001/10/25 05:50:05 momjian Exp $ + * $Id: pg_list.h,v 1.25 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -147,4 +147,5 @@ extern void freeList(List *list); /* in copyfuncs.c */ extern List *listCopy(List *list); + #endif /* PG_LIST_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index be66b92fce5..746732984c7 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.51 2001/10/25 05:50:05 momjian Exp $ + * $Id: plannodes.h,v 1.52 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -373,10 +373,10 @@ typedef struct Unique */ typedef enum SetOpCmd { - SETOPCMD_INTERSECT, - SETOPCMD_INTERSECT_ALL, - SETOPCMD_EXCEPT, - SETOPCMD_EXCEPT_ALL + SETOPCMD_INTERSECT, + SETOPCMD_INTERSECT_ALL, + SETOPCMD_EXCEPT, + SETOPCMD_EXCEPT_ALL } SetOpCmd; typedef struct SetOp @@ -463,4 +463,5 @@ typedef struct SubPlan bool needShutdown; /* TRUE = need to shutdown subplan */ HeapTuple curTuple; /* copy of most recent tuple from subplan */ } SubPlan; + #endif /* PLANNODES_H */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index b9bada1332a..a5892738c0b 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.55 2001/10/25 05:50:05 momjian Exp $ + * $Id: primnodes.h,v 1.56 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,7 @@ typedef struct Fjoin */ typedef enum OpType { - OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR, SUBPLAN_EXPR + OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR, SUBPLAN_EXPR } OpType; typedef struct Expr @@ -345,7 +345,7 @@ typedef struct Aggref */ typedef enum SubLinkType { - EXISTS_SUBLINK, ALL_SUBLINK, ANY_SUBLINK, MULTIEXPR_SUBLINK, EXPR_SUBLINK + EXISTS_SUBLINK, ALL_SUBLINK, ANY_SUBLINK, MULTIEXPR_SUBLINK, EXPR_SUBLINK } SubLinkType; @@ -549,4 +549,5 @@ typedef struct FromExpr List *fromlist; /* List of join subtrees */ Node *quals; /* qualifiers on join, if any */ } FromExpr; + #endif /* PRIMNODES_H */ diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index c40daed69ed..939587ccee3 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: print.h,v 1.14 2001/10/25 05:50:05 momjian Exp $ + * $Id: print.h,v 1.15 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern void print_slot(TupleTableSlot *slot); extern void print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label); extern void print_plan(Plan *p, Query *parsetree); + #endif /* PRINT_H */ diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h index f770e28c696..fbfccd91b29 100644 --- a/src/include/nodes/readfuncs.h +++ b/src/include/nodes/readfuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: readfuncs.h,v 1.12 2001/10/25 05:50:05 momjian Exp $ + * $Id: readfuncs.h,v 1.13 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern void *nodeRead(bool read_car_only); * prototypes for functions in readfuncs.c */ extern Node *parsePlanString(void); + #endif /* READFUNCS_H */ diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 117b95f73e1..b3f10b5b2c6 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.59 2001/10/25 05:50:05 momjian Exp $ + * $Id: relation.h,v 1.60 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ typedef List *Relids; */ typedef enum CostSelector { - STARTUP_COST, TOTAL_COST + STARTUP_COST, TOTAL_COST } CostSelector; /*---------- @@ -221,7 +221,7 @@ typedef struct IndexOptInfo Oid *ordering; /* OIDs of sort operators for each column */ Oid relam; /* OID of the access method (in pg_am) */ - RegProcedure amcostestimate; /* OID of the access method's cost fcn */ + RegProcedure amcostestimate; /* OID of the access method's cost fcn */ Oid indproc; /* if a functional index */ List *indpred; /* if a partial index */ @@ -339,7 +339,7 @@ typedef struct TidPath { Path path; List *tideval; - Relids unjoined_relids; /* some rels not yet part of my Path */ + Relids unjoined_relids; /* some rels not yet part of my Path */ } TidPath; /* @@ -525,7 +525,7 @@ typedef struct RestrictInfo Oid hashjoinoperator; /* copy of clause operator */ /* cache space for hashclause processing; -1 if not yet set */ - Selectivity left_bucketsize; /* avg bucketsize of left side */ + Selectivity left_bucketsize; /* avg bucketsize of left side */ Selectivity right_bucketsize; /* avg bucketsize of right side */ } RestrictInfo; @@ -546,7 +546,7 @@ typedef struct RestrictInfo typedef struct JoinInfo { NodeTag type; - Relids unjoined_relids; /* some rels not yet part of my RelOptInfo */ + Relids unjoined_relids; /* some rels not yet part of my RelOptInfo */ List *jinfo_restrictinfo; /* relevant RestrictInfos */ } JoinInfo; @@ -587,4 +587,5 @@ typedef struct Stream Cost groupcost; Selectivity groupsel; } Stream; + #endif /* RELATION_H */ diff --git a/src/include/optimizer/_deadcode/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h index 8d14f90288a..039528dc29f 100644 --- a/src/include/optimizer/_deadcode/xfunc.h +++ b/src/include/optimizer/_deadcode/xfunc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xfunc.h,v 1.6 2001/10/25 05:50:06 momjian Exp $ + * $Id: xfunc.h,v 1.7 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,4 +79,5 @@ extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to); * function prototypes for path/predmig.c */ extern bool xfunc_do_predmig(Path root); + #endif /* XFUNC_H */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 366e3821169..aa97bcc862c 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.46 2001/10/25 05:50:05 momjian Exp $ + * $Id: clauses.h,v 1.47 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,4 +71,5 @@ extern void query_tree_mutator(Query *query, Node *(*mutator) (), #define is_subplan(clause) ((clause) != NULL && \ IsA(clause, Expr) && \ ((Expr *) (clause))->opType == SUBPLAN_EXPR) + #endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index b163505875e..46093694b14 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.41 2001/10/25 05:50:05 momjian Exp $ + * $Id: cost.h,v 1.42 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -94,4 +94,5 @@ extern Selectivity clauselist_selectivity(Query *root, extern Selectivity clause_selectivity(Query *root, Node *clause, int varRelid); + #endif /* COST_H */ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index 8b8e7a59534..bf834d439e9 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo.h,v 1.25 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo.h,v 1.26 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,7 +48,7 @@ /* If you change these, update backend/utils/misc/postgresql.sample.conf */ extern int Geqo_pool_size; -#define DEFAULT_GEQO_POOL_SIZE 0/* = default based on no. of relations. */ +#define DEFAULT_GEQO_POOL_SIZE 0 /* = default based on no. of relations. */ #define MIN_GEQO_POOL_SIZE 128 #define MAX_GEQO_POOL_SIZE 1024 @@ -76,4 +76,5 @@ extern Cost geqo_eval(Query *root, List *initial_rels, extern RelOptInfo *gimme_tree(Query *root, List *initial_rels, Gene *tour, int num_gene, int rel_count, RelOptInfo *old_rel); + #endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h index 15d7ba4c920..f9cff6bf667 100644 --- a/src/include/optimizer/geqo_copy.h +++ b/src/include/optimizer/geqo_copy.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_copy.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_copy.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,5 @@ #include "optimizer/geqo_gene.h" extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length); + #endif /* GEQO_COPY_H */ diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index 528ba2bce16..06194d99ca3 100644 --- a/src/include/optimizer/geqo_gene.h +++ b/src/include/optimizer/geqo_gene.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_gene.h,v 1.11 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_gene.h,v 1.12 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ typedef struct Pool int size; int string_length; } Pool; + #endif /* GEQO_GENE_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 24c7b7a351b..d04f4a5d88a 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.16 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_misc.h,v 1.17 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene); extern void geqo_print_rel(Query *root, RelOptInfo *rel); extern void geqo_print_path(Query *root, Path *path, int indent); extern void geqo_print_joinclauses(Query *root, List *clauses); + #endif /* GEQO_MISC_H */ diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h index 85d2879ad6c..6754ea95209 100644 --- a/src/include/optimizer/geqo_mutation.h +++ b/src/include/optimizer/geqo_mutation.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_mutation.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_mutation.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,5 @@ #include "optimizer/geqo_gene.h" extern void geqo_mutation(Gene *tour, int num_gene); + #endif /* GEQO_MUTATION_H */ diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index 6f0db6a7e29..b2eb4cb2415 100644 --- a/src/include/optimizer/geqo_pool.h +++ b/src/include/optimizer/geqo_pool.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_pool.h,v 1.13 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_pool.h,v 1.14 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,4 +37,5 @@ extern void free_chromo(Chromosome *chromo); extern void spread_chromo(Chromosome *chromo, Pool *pool); extern void sort_pool(Pool *pool); + #endif /* GEQO_POOL_H */ diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h index c9293c8f62b..4c5a1ac8ce1 100644 --- a/src/include/optimizer/geqo_random.h +++ b/src/include/optimizer/geqo_random.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_random.h,v 1.9 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_random.h,v 1.10 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,4 +34,5 @@ #define geqo_randint(upper,lower) \ ( (int) floor( geqo_rand()*(((upper)-(lower))+0.999999) ) + (lower) ) + #endif /* GEQO_RANDOM_H */ diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h index a3d94f7cdfa..9c10cfec9c8 100644 --- a/src/include/optimizer/geqo_selection.h +++ b/src/include/optimizer/geqo_selection.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_selection.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ + * $Id: geqo_selection.h,v 1.11 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,5 @@ #include "optimizer/geqo_gene.h" extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias); + #endif /* GEQO_SELECTION_H */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 9573a2ce510..f905d385098 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.18 2001/10/25 05:50:05 momjian Exp $ + * $Id: joininfo.h,v 1.19 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "nodes/relation.h" extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids); + #endif /* JOININFO_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 4de4ffa3675..0c05bbdaa67 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.39 2001/10/25 05:50:05 momjian Exp $ + * $Id: pathnode.h,v 1.40 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,4 +75,5 @@ extern RelOptInfo *build_join_rel(Query *root, RelOptInfo *inner_rel, JoinType jointype, List **restrictlist_ptr); + #endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 0d57d89bbbb..c725e2126c0 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.57 2001/10/25 05:50:05 momjian Exp $ + * $Id: paths.h,v 1.58 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,12 +88,10 @@ extern RelOptInfo *make_jointree_rel(Query *root, Node *jtnode); */ typedef enum { - PATHKEYS_EQUAL, /* pathkeys are identical */ - PATHKEYS_BETTER1, /* pathkey 1 is a superset of - * pathkey 2 */ - PATHKEYS_BETTER2, /* vice versa */ - PATHKEYS_DIFFERENT /* neither pathkey includes the - * other */ + PATHKEYS_EQUAL, /* pathkeys are identical */ + PATHKEYS_BETTER1, /* pathkey 1 is a superset of pathkey 2 */ + PATHKEYS_BETTER2, /* vice versa */ + PATHKEYS_DIFFERENT /* neither pathkey includes the other */ } PathKeysComparison; extern void add_equijoined_keys(Query *root, RestrictInfo *restrictinfo); @@ -132,4 +130,5 @@ extern int pathkeys_useful_for_ordering(Query *root, List *pathkeys); extern List *truncate_useless_pathkeys(Query *root, RelOptInfo *rel, List *pathkeys); + #endif /* PATHS_H */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 1f60ee18df3..5fda9af760b 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plancat.h,v 1.24 2001/10/25 05:50:05 momjian Exp $ + * $Id: plancat.h,v 1.25 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,5 @@ extern Selectivity restriction_selectivity(Query *root, extern Selectivity join_selectivity(Query *root, Oid operator, List *args); + #endif /* PLANCAT_H */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 8831bb45d28..8c5bbf58063 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.52 2001/10/25 05:50:05 momjian Exp $ + * $Id: planmain.h,v 1.53 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,4 +67,5 @@ extern void fix_opids(Node *node); extern bool _use_keyset_query_optimizer; extern void transformKeySetQuery(Query *origNode); + #endif /* PLANMAIN_H */ diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index acd6ff53260..7db7e5d1656 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planner.h,v 1.21 2001/10/25 05:50:06 momjian Exp $ + * $Id: planner.h,v 1.22 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern Plan *subquery_planner(Query *parse, double tuple_fraction); extern Plan *make_sortplan(Query *parse, List *tlist, Plan *plannode, List *sortcls); + #endif /* PLANNER_H */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index e4a55e662c4..e6fa5c437fc 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: prep.h,v 1.29 2001/10/25 05:50:06 momjian Exp $ + * $Id: prep.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,5 @@ extern List *expand_inherted_rtentry(Query *parse, Index rti, extern Node *adjust_inherited_attrs(Node *node, Index old_rt_index, Oid old_relid, Index new_rt_index, Oid new_relid); + #endif /* PREP_H */ diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 186cf288326..6fb0fb22eea 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: restrictinfo.h,v 1.12 2001/10/25 05:50:06 momjian Exp $ + * $Id: restrictinfo.h,v 1.13 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern bool restriction_is_or_clause(RestrictInfo *restrictinfo); extern List *get_actual_clauses(List *restrictinfo_list); extern void get_actual_join_clauses(List *restrictinfo_list, List **joinquals, List **otherquals); + #endif /* RESTRICTINFO_H */ diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index a56fed5914e..9c56a7592ba 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -17,4 +17,5 @@ extern int PlannerPlanId; /* to assign unique ID to subquery plans */ extern List *SS_finalize_plan(Plan *plan); extern Node *SS_replace_correlation_vars(Node *expr); extern Node *SS_process_sublinks(Node *expr); + #endif /* SUBSELECT_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 796649d5964..44c4965bf6b 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.29 2001/10/25 05:50:06 momjian Exp $ + * $Id: tlist.h,v 1.30 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,5 @@ extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause, List *targetList); extern Node *get_sortgroupclause_expr(SortClause *sortClause, List *targetList); + #endif /* TLIST_H */ diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index 536fc839e10..9d3fdc5e51b 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: var.h,v 1.15 2001/10/25 05:50:06 momjian Exp $ + * $Id: var.h,v 1.16 2001/10/28 06:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,5 @@ extern bool contain_var_reference(Node *node, int varno, int varattno, extern bool contain_whole_tuple_var(Node *node, int varno, int levelsup); extern bool contain_var_clause(Node *node); extern List *pull_var_clause(Node *node, bool includeUpperVars); + #endif /* VAR_H */ diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index b72ed674118..9b21d31f866 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.16 2001/10/25 05:50:06 momjian Exp $ + * $Id: analyze.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void CheckSelectForUpdate(Query *qry); /* This was exported to allow ADD CONSTRAINT to make use of it */ extern char *makeObjectName(char *name1, char *name2, char *typename); + #endif /* ANALYZE_H */ diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index 3399b7ea353..14829dafc80 100644 --- a/src/include/parser/gramparse.h +++ b/src/include/parser/gramparse.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gramparse.h,v 1.17 2001/10/25 05:50:06 momjian Exp $ + * $Id: gramparse.h,v 1.18 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,5 @@ extern int yyparse(void); extern char *xlateSqlFunc(char *name); extern char *xlateSqlType(char *name); bool exprIsNullConstant(Node *arg); + #endif /* GRAMPARSE_H */ diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h index ef4b6658969..b9c0abc8109 100644 --- a/src/include/parser/keywords.h +++ b/src/include/parser/keywords.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: keywords.h,v 1.10 2001/10/25 05:50:06 momjian Exp $ + * $Id: keywords.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ typedef struct ScanKeyword } ScanKeyword; extern ScanKeyword *ScanKeywordLookup(char *text); + #endif /* KEYWORDS_H */ diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 943f4d54da1..fb6048560bd 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.18 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_agg.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,5 @@ extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, List *args, bool agg_star, bool agg_distinct, int precedence); extern void agg_error(char *caller, char *aggname, Oid basetypeID); + #endif /* PARSE_AGG_H */ diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index 2e47fe8a356..ed97f6a8578 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_clause.h,v 1.25 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_clause.h,v 1.26 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,4 +30,5 @@ extern List *transformDistinctClause(ParseState *pstate, List *distinctlist, extern List *addAllTargetsToSortList(List *sortlist, List *targetlist); extern Index assignSortGroupRef(TargetEntry *tle, List *tlist); + #endif /* PARSE_CLAUSE_H */ diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 4614492d8e2..e556db33b38 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.35 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_coerce.h,v 1.36 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,18 +19,18 @@ typedef enum CATEGORY { - INVALID_TYPE, - UNKNOWN_TYPE, - BOOLEAN_TYPE, - STRING_TYPE, - BITSTRING_TYPE, - NUMERIC_TYPE, - DATETIME_TYPE, - TIMESPAN_TYPE, - GEOMETRIC_TYPE, - NETWORK_TYPE, - USER_TYPE, - MIXED_TYPE + INVALID_TYPE, + UNKNOWN_TYPE, + BOOLEAN_TYPE, + STRING_TYPE, + BITSTRING_TYPE, + NUMERIC_TYPE, + DATETIME_TYPE, + TIMESPAN_TYPE, + GEOMETRIC_TYPE, + NETWORK_TYPE, + USER_TYPE, + MIXED_TYPE } CATEGORY; @@ -81,4 +81,5 @@ extern Oid select_common_type(List *typeids, const char *context); extern Node *coerce_to_common_type(ParseState *pstate, Node *node, Oid targetTypeId, const char *context); + #endif /* PARSE_COERCE_H */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 6cc0796ca93..2367ac9dc9f 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.23 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_expr.h,v 1.24 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ extern int32 exprTypmod(Node *expr); extern bool exprIsLengthCoercion(Node *expr, int32 *coercedTypmod); extern void parse_expr_init(void); extern char *TypeNameToInternalName(TypeName *typename); + #endif /* PARSE_EXPR_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index fb63798e784..6edf39689d4 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.33 2001/10/25 05:50:06 momjian Exp $ + * $Id: parse_func.h,v 1.34 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,9 +41,9 @@ typedef struct _CandidateList /* Result codes for func_get_detail */ typedef enum { - FUNCDETAIL_NOTFOUND, /* no suitable interpretation */ - FUNCDETAIL_NORMAL, /* found a matching function */ - FUNCDETAIL_COERCION /* it's a type coercion request */ + FUNCDETAIL_NOTFOUND, /* no suitable interpretation */ + FUNCDETAIL_NORMAL, /* found a matching function */ + FUNCDETAIL_COERCION /* it's a type coercion request */ } FuncDetailCode; @@ -63,4 +63,5 @@ extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId); extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); + #endif /* PARSE_FUNC_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 2efb13ac2ac..ce8f3007d0f 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_node.h,v 1.27 2001/10/25 05:50:08 momjian Exp $ + * $Id: parse_node.h,v 1.28 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,4 +62,5 @@ extern ArrayRef *transformArraySubscripts(ParseState *pstate, bool forceSlice, Node *assignFrom); extern Const *make_const(Value *value); + #endif /* PARSE_NODE_H */ diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index cde4a1fe544..89e2df820b4 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_oper.h,v 1.16 2001/10/25 05:50:09 momjian Exp $ + * $Id: parse_oper.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ extern Oid any_ordering_op(Oid argtype); /* Extract operator OID or underlying-function OID from an Operator tuple */ extern Oid oprid(Operator op); extern Oid oprfuncid(Operator op); + #endif /* PARSE_OPER_H */ diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 81d3584e838..dd8307c778e 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.26 2001/10/25 05:50:09 momjian Exp $ + * $Id: parse_relation.h,v 1.27 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,4 +47,5 @@ extern List *expandJoinAttrs(ParseState *pstate, JoinExpr *join, extern int attnameAttNum(Relation rd, char *a); extern Name attnumAttName(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid); + #endif /* PARSE_RELATION_H */ diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 5ce539bfd60..f31f49dbf44 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_target.h,v 1.21 2001/10/25 05:50:09 momjian Exp $ + * $Id: parse_target.h,v 1.22 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern Node *CoerceTargetExpr(ParseState *pstate, Node *expr, Oid type_id, Oid attrtype, int32 attrtypmod); extern List *checkInsertTargets(ParseState *pstate, List *cols, List **attrnos); + #endif /* PARSE_TARGET_H */ diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h index 3b3689af5f3..47b756d6b49 100644 --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_type.h,v 1.18 2001/10/25 05:50:09 momjian Exp $ + * $Id: parse_type.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,4 +37,5 @@ extern Oid typenameTypeId(char *s); extern void parseTypeString(const char *str, Oid *type_id, int32 *typmod); #define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid) + #endif /* PARSE_TYPE_H */ diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h index d4c80288776..e0e201cd488 100644 --- a/src/include/parser/parser.h +++ b/src/include/parser/parser.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parser.h,v 1.9 2001/10/25 05:50:09 momjian Exp $ + * $Id: parser.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "parser/parse_node.h" extern List *parser(char *str, Oid *typev, int nargs); + #endif /* PARSER_H */ diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index fdf0218d8c6..7392f2e2242 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsetree.h,v 1.14 2001/10/25 05:50:09 momjian Exp $ + * $Id: parsetree.h,v 1.15 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,4 +51,5 @@ * variable name or alias for that attribute of that RTE. */ extern char *get_rte_attribute_name(RangeTblEntry *rte, AttrNumber attnum); + #endif /* PARSETREE_H */ diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h index b8cd4023e52..a82839cdb79 100644 --- a/src/include/parser/scansup.h +++ b/src/include/parser/scansup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: scansup.h,v 1.9 2001/10/25 05:50:09 momjian Exp $ + * $Id: scansup.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,5 @@ #define SCANSUP_H extern char *scanstr(char *s); + #endif /* SCANSUP_H */ diff --git a/src/include/port/darwin.h b/src/include/port/darwin.h index 618eded7fd6..0d35a8a2f49 100644 --- a/src/include/port/darwin.h +++ b/src/include/port/darwin.h @@ -9,4 +9,5 @@ typedef unsigned int slock_t; #else typedef unsigned char slock_t; + #endif diff --git a/src/include/port/darwin/sem.h b/src/include/port/darwin/sem.h index 9e4b95abf64..96df7bd6033 100644 --- a/src/include/port/darwin/sem.h +++ b/src/include/port/darwin/sem.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/include/port/darwin/Attic/sem.h,v 1.3 2001/10/25 05:50:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/port/darwin/Attic/sem.h,v 1.4 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,4 +70,5 @@ extern "C" #ifdef __cplusplus } #endif + #endif /* _SYS_SEM_H */ diff --git a/src/include/port/dgux.h b/src/include/port/dgux.h index d8fd311e69c..e0e0c74de18 100644 --- a/src/include/port/dgux.h +++ b/src/include/port/dgux.h @@ -9,4 +9,5 @@ #endif #ifndef BYTE_ORDER #define BYTE_ORDER BIG_ENDIAN + #endif diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h index 7759191b8d2..a884b9da0d9 100644 --- a/src/include/port/freebsd.h +++ b/src/include/port/freebsd.h @@ -33,4 +33,5 @@ typedef unsigned char slock_t; #if defined(__mips__) /* # undef HAS_TEST_AND_SET */ + #endif diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h index 870b12f263a..e140c3cfcfc 100644 --- a/src/include/port/hpux.h +++ b/src/include/port/hpux.h @@ -15,4 +15,5 @@ typedef struct #endif #ifndef BYTE_ORDER #define BYTE_ORDER BIG_ENDIAN + #endif diff --git a/src/include/port/linux.h b/src/include/port/linux.h index b46766570ee..c5d58489ba1 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -37,4 +37,5 @@ typedef unsigned int slock_t; typedef unsigned int slock_t; #define HAS_TEST_AND_SET + #endif diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h index aba5c72fe62..7729fa5b9bb 100644 --- a/src/include/port/netbsd.h +++ b/src/include/port/netbsd.h @@ -44,4 +44,5 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; + #endif diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h index aba5c72fe62..7729fa5b9bb 100644 --- a/src/include/port/openbsd.h +++ b/src/include/port/openbsd.h @@ -44,4 +44,5 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; + #endif diff --git a/src/include/port/osf.h b/src/include/port/osf.h index aec6a70dbee..6dfe3ea9b82 100644 --- a/src/include/port/osf.h +++ b/src/include/port/osf.h @@ -1,7 +1,7 @@ #define NOFIXADE #define DISABLE_XOPEN_NLS #define HAS_TEST_AND_SET - /* #include <sys/mman.h> *//* for msemaphore */ + /* #include <sys/mman.h> */ /* for msemaphore */ /*typedef msemaphore slock_t;*/ #include <alpha/builtins.h> typedef volatile long slock_t; diff --git a/src/include/port/sco.h b/src/include/port/sco.h index 438e5b2001f..7aa2370443e 100644 --- a/src/include/port/sco.h +++ b/src/include/port/sco.h @@ -19,4 +19,5 @@ typedef unsigned char slock_t; #endif #ifndef BYTE_ORDER #define BYTE_ORDER LITTLE_ENDIAN + #endif diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h index af715f5e11d..ac1e485ba3d 100644 --- a/src/include/port/solaris.h +++ b/src/include/port/solaris.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.5 2001/10/25 05:50:09 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.6 2001/10/28 06:26:08 momjian Exp $ */ #define HAS_TEST_AND_SET typedef unsigned char slock_t; @@ -57,4 +57,5 @@ typedef unsigned char slock_t; #define NAN (0.0/0.0) #endif /* GCC. */ + #endif /* not NAN */ diff --git a/src/include/port/sunos4.h b/src/include/port/sunos4.h index 06c5ba99e30..5d7e911cf34 100644 --- a/src/include/port/sunos4.h +++ b/src/include/port/sunos4.h @@ -15,4 +15,5 @@ typedef unsigned char slock_t; #endif #ifndef BYTE_ORDER #define BYTE_ORDER BIG_ENDIAN + #endif diff --git a/src/include/port/svr4.h b/src/include/port/svr4.h index d5e7f90f72c..2c6e2b4e713 100644 --- a/src/include/port/svr4.h +++ b/src/include/port/svr4.h @@ -9,4 +9,5 @@ #include "abi_mutex.h" typedef abilock_t slock_t; + #endif diff --git a/src/include/port/univel.h b/src/include/port/univel.h index 071ac1f1ad2..16c85b9fa4c 100644 --- a/src/include/port/univel.h +++ b/src/include/port/univel.h @@ -20,4 +20,5 @@ typedef unsigned char slock_t; #endif #ifndef BYTE_ORDER #define BYTE_ORDER LITTLE_ENDIAN + #endif diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h index 789f1e1b72d..da02084c697 100644 --- a/src/include/port/unixware.h +++ b/src/include/port/unixware.h @@ -23,4 +23,5 @@ typedef unsigned char slock_t; #endif #ifndef BYTE_ORDER #define BYTE_ORDER LITTLE_ENDIAN + #endif diff --git a/src/include/port/win.h b/src/include/port/win.h index b9d6308d77d..e22502d39fb 100644 --- a/src/include/port/win.h +++ b/src/include/port/win.h @@ -15,4 +15,5 @@ typedef unsigned char slock_t; */ #if CYGWIN_VERSION_DLL_MAJOR < 1001 #undef HAVE_UNIX_SOCKETS + #endif diff --git a/src/include/postgres.h b/src/include/postgres.h index 39c6fffdcab..41f141677ba 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.54 2001/10/25 05:49:54 momjian Exp $ + * $Id: postgres.h,v 1.55 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,7 +77,7 @@ typedef struct varattrib int32 va_extsize; /* External saved size */ Oid va_valueid; /* Unique identifier of value */ Oid va_toastrelid; /* RelID where to find chunks */ - } va_external; /* External stored attribute */ + } va_external; /* External stored attribute */ char va_data[1]; /* Plain stored attribute */ } va_content; diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h index dc9058360bc..0699cebdf8d 100644 --- a/src/include/postgres_ext.h +++ b/src/include/postgres_ext.h @@ -15,7 +15,7 @@ * use header files that are otherwise internal to Postgres to interface * with the backend. * - * $Id: postgres_ext.h,v 1.8 2001/10/25 05:49:55 momjian Exp $ + * $Id: postgres_ext.h,v 1.9 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ typedef unsigned int Oid; * NOTE that databases with different NAMEDATALEN's cannot interoperate! */ #define NAMEDATALEN 32 + #endif diff --git a/src/include/postgres_fe.h b/src/include/postgres_fe.h index 4aed68eb194..8480481705b 100644 --- a/src/include/postgres_fe.h +++ b/src/include/postgres_fe.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres_fe.h,v 1.3 2001/10/25 05:49:55 momjian Exp $ + * $Id: postgres_fe.h,v 1.4 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,5 @@ #define POSTGRES_FE_H #include "c.h" + #endif /* POSTGRES_FE_H */ diff --git a/src/include/regex/cclass.h b/src/include/regex/cclass.h index c0ae7da4f65..700c712d8ca 100644 --- a/src/include/regex/cclass.h +++ b/src/include/regex/cclass.h @@ -43,7 +43,7 @@ static struct cclass char *name; char *chars; char *multis; -} cclasses[] = +} cclasses[] = { { diff --git a/src/include/regex/cname.h b/src/include/regex/cname.h index a333e9c4e5e..235de80a2d5 100644 --- a/src/include/regex/cname.h +++ b/src/include/regex/cname.h @@ -42,7 +42,7 @@ static struct cname { char *name; char code; -} cnames[] = +} cnames[] = { { diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index 9ef8bee95a5..180bfe204f5 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -109,4 +109,5 @@ extern int pg95_regexec(const regex_t *preg, const char *string, size_t nmatch, regmatch_t *pmatch, int eflags); extern void pg95_regfree(regex_t *preg); + #endif /* !_REGEX_H_ */ diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h index 8bcdddb65ab..98bf46a52e3 100644 --- a/src/include/regex/regex2.h +++ b/src/include/regex/regex2.h @@ -193,4 +193,5 @@ struct re_guts (isalnum((unsigned char) (c)) || (c) == '_')) #else #define ISWORD(c) (isalnum((unsigned char) (c)) || (c) == '_') + #endif diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h index 0ef6c50a8e2..4a29c217264 100644 --- a/src/include/regex/utils.h +++ b/src/include/regex/utils.h @@ -60,4 +60,5 @@ typedef unsigned char uch; #define NDEBUG /* no assertions please */ #endif #endif + #endif /* _REGEX_UTILS_H */ diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h index 3d24d331383..983f41f1c9a 100644 --- a/src/include/rewrite/prs2lock.h +++ b/src/include/rewrite/prs2lock.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: prs2lock.h,v 1.13 2001/10/25 05:50:09 momjian Exp $ + * $Id: prs2lock.h,v 1.14 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,5 @@ typedef struct RuleLock int numLocks; RewriteRule **rules; } RuleLock; + #endif /* REWRITE_H */ diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h index 91ab7272c96..49d3d1896e0 100644 --- a/src/include/rewrite/rewriteDefine.h +++ b/src/include/rewrite/rewriteDefine.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteDefine.h,v 1.11 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteDefine.h,v 1.12 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,5 @@ extern void DefineQueryRewrite(RuleStmt *args); extern void RenameRewriteRule(char *oldname, char *newname); + #endif /* REWRITEDEFINE_H */ diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index 1a80dd2b3ce..a8210cc4e96 100644 --- a/src/include/rewrite/rewriteHandler.h +++ b/src/include/rewrite/rewriteHandler.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteHandler.h,v 1.16 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteHandler.h,v 1.17 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,5 @@ extern List *QueryRewrite(Query *parsetree); + #endif /* REWRITEHANDLER_H */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index cdb28e01496..75539b33447 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteManip.h,v 1.28 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteManip.h,v 1.29 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,4 +39,5 @@ extern bool checkExprHasSubLink(Node *node); extern Node *ResolveNew(Node *node, int target_varno, int sublevels_up, List *targetlist, int event, int update_varno); + #endif /* REWRITEMANIP_H */ diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h index a961ea5a86b..d6a440912a2 100644 --- a/src/include/rewrite/rewriteRemove.h +++ b/src/include/rewrite/rewriteRemove.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteRemove.h,v 1.8 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteRemove.h,v 1.9 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ extern char *RewriteGetRuleEventRel(char *rulename); extern void RemoveRewriteRule(char *ruleName); extern void RelationRemoveRules(Oid relid); + #endif /* REWRITEREMOVE_H */ diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h index 7fa559f4c18..b64a20a8dc1 100644 --- a/src/include/rewrite/rewriteSupport.h +++ b/src/include/rewrite/rewriteSupport.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteSupport.h,v 1.18 2001/10/25 05:50:09 momjian Exp $ + * $Id: rewriteSupport.h,v 1.19 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern char *MakeRetrieveViewRuleName(const char *view_name); extern void SetRelationRuleStatus(Oid relationId, bool relHasRules, bool relIsBecomingView); + #endif /* REWRITESUPPORT_H */ diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h index 9f3d92e4e02..da8cc6125d2 100644 --- a/src/include/rusagestub.h +++ b/src/include/rusagestub.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rusagestub.h,v 1.7 2001/10/25 05:49:55 momjian Exp $ + * $Id: rusagestub.h,v 1.8 2001/10/28 06:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,5 @@ struct rusage }; extern int getrusage(int who, struct rusage * rusage); + #endif /* RUSAGESTUB_H */ diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h index 1eac0172e3d..212f4e0f11e 100644 --- a/src/include/storage/backendid.h +++ b/src/include/storage/backendid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: backendid.h,v 1.10 2001/10/25 05:50:09 momjian Exp $ + * $Id: backendid.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,5 @@ typedef int BackendId; /* unique currently active backend #define InvalidBackendId (-1) extern BackendId MyBackendId; /* backend id of this backend */ + #endif /* BACKENDID_H */ diff --git a/src/include/storage/block.h b/src/include/storage/block.h index 90bcf6b2c53..d4516f5b7b8 100644 --- a/src/include/storage/block.h +++ b/src/include/storage/block.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: block.h,v 1.14 2001/10/25 05:50:09 momjian Exp $ + * $Id: block.h,v 1.15 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -117,4 +117,5 @@ typedef BlockIdData *BlockId; /* block identifier */ AssertMacro(BlockIdIsValid(blockId)), \ (BlockNumber) (((blockId)->bi_hi << 16) | ((uint16) (blockId)->bi_lo)) \ ) + #endif /* BLOCK_H */ diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h index 4d767b808fc..702a3976d1a 100644 --- a/src/include/storage/buf.h +++ b/src/include/storage/buf.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buf.h,v 1.10 2001/10/25 05:50:09 momjian Exp $ + * $Id: buf.h,v 1.11 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,5 @@ typedef int Buffer; * - plai 9/10/90 */ #undef NO_BUFFERISVALID + #endif /* BUF_H */ diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 2ba2cfb3aa6..46eca54d11a 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buf_internals.h,v 1.52 2001/10/25 05:50:09 momjian Exp $ + * $Id: buf_internals.h,v 1.53 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -102,7 +102,7 @@ typedef struct sbufdesc * BM_PIN_COUNT_WAITER. At present, there can be only one such waiter * per buffer. */ - BackendId wait_backend_id; /* backend ID of pin-count waiter */ + BackendId wait_backend_id; /* backend ID of pin-count waiter */ } BufferDesc; #define BufferDescriptorGetBuffer(bdesc) ((bdesc)->buf_id + 1) @@ -183,4 +183,5 @@ extern int WriteLocalBuffer(Buffer buffer, bool release); extern int FlushLocalBuffer(Buffer buffer, bool sync, bool release); extern void LocalBufferSync(void); extern void ResetLocalBufferPool(void); + #endif /* BUFMGR_INTERNALS_H */ diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h index c39463a7e06..cf40254bee1 100644 --- a/src/include/storage/buffile.h +++ b/src/include/storage/buffile.h @@ -18,7 +18,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buffile.h,v 1.9 2001/10/25 05:50:10 momjian Exp $ + * $Id: buffile.h,v 1.10 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size); extern int BufFileSeek(BufFile *file, int fileno, long offset, int whence); extern void BufFileTell(BufFile *file, int *fileno, long *offset); extern int BufFileSeekBlock(BufFile *file, long blknum); + #endif /* BUFFILE_H */ diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 8d755db16e3..1655ad02e50 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.55 2001/10/25 05:50:10 momjian Exp $ + * $Id: bufmgr.h,v 1.56 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -191,4 +191,5 @@ extern void BufmgrCommit(void); extern void BufferSync(void); extern void InitLocalBuffer(void); + #endif diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index b948fd06b8b..58b83515f63 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bufpage.h,v 1.44 2001/10/25 05:50:10 momjian Exp $ + * $Id: bufpage.h,v 1.45 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -132,8 +132,8 @@ typedef PageHeaderData *PageHeader; typedef enum { - ShufflePageManagerMode, - OverwritePageManagerMode + ShufflePageManagerMode, + OverwritePageManagerMode } PageManagerMode; /* ---------------------------------------------------------------- diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 31eb02c72d5..670a7e5abab 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fd.h,v 1.32 2001/10/25 05:50:10 momjian Exp $ + * $Id: fd.h,v 1.33 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,4 +78,5 @@ extern void AtEOXact_Files(void); extern void RemovePgTempFiles(void); extern int pg_fsync(int fd); extern int pg_fdatasync(int fd); + #endif /* FD_H */ diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index 6aebd60e20c..d9ba1a796f9 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: freespace.h,v 1.4 2001/10/25 05:50:10 momjian Exp $ + * $Id: freespace.h,v 1.5 2001/10/28 06:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,4 +47,5 @@ extern void FreeSpaceMapForgetDatabase(Oid dbid); #ifdef FREESPACE_DEBUG extern void DumpFreeSpace(void); #endif + #endif /* FREESPACE_H */ diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index 861104d6e5a..451aede3c4a 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: ipc.h,v 1.52 2001/10/25 05:50:10 momjian Exp $ + * $Id: ipc.h,v 1.53 2001/10/28 06:26:08 momjian Exp $ * * Some files that would normally need to include only sys/ipc.h must * instead include this file because on Ultrix, sys/ipc.h is not designed @@ -89,4 +89,5 @@ extern bool SharedMemoryIsInUse(IpcMemoryKey shmKey, IpcMemoryId shmId); /* ipci.c */ extern void CreateSharedMemoryAndSemaphores(bool makePrivate, int maxBackends); + #endif /* IPC_H */ diff --git a/src/include/storage/item.h b/src/include/storage/item.h index afb869444a8..1bfcabb1eea 100644 --- a/src/include/storage/item.h +++ b/src/include/storage/item.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: item.h,v 1.8 2001/10/25 05:50:10 momjian Exp $ + * $Id: item.h,v 1.9 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,4 +15,5 @@ #define ITEM_H typedef Pointer Item; + #endif /* ITEM_H */ diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h index ab4dca9b516..fae39dfc7f1 100644 --- a/src/include/storage/itemid.h +++ b/src/include/storage/itemid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itemid.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: itemid.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -93,4 +93,5 @@ typedef bits16 ItemIdFlags; AssertMacro(ItemIdIsValid(itemId)), \ (bool) (((itemId)->lp_flags & LP_USED) != 0) \ ) + #endif /* ITEMID_H */ diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h index 453863cd40b..1b18928a8d9 100644 --- a/src/include/storage/itempos.h +++ b/src/include/storage/itempos.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itempos.h,v 1.13 2001/10/25 05:50:10 momjian Exp $ + * $Id: itempos.h,v 1.14 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,5 @@ typedef ItemSubpositionData *ItemSubposition; */ #define PSKIP(OBJP, LEN)\ do { (OBJP)->op_cp += (LEN); (OBJP)->op_len -= (LEN); } while (0) + #endif /* ITEMPOS_H */ diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index 30fb9184773..f9d8e27f3dc 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itemptr.h,v 1.19 2001/10/25 05:50:10 momjian Exp $ + * $Id: itemptr.h,v 1.20 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -142,4 +142,5 @@ typedef ItemPointerData *ItemPointer; */ extern bool ItemPointerEquals(ItemPointer pointer1, ItemPointer pointer2); + #endif /* ITEMPTR_H */ diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h index a87a8e301b9..8ea1d34df43 100644 --- a/src/include/storage/large_object.h +++ b/src/include/storage/large_object.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: large_object.h,v 1.22 2001/10/25 05:50:10 momjian Exp $ + * $Id: large_object.h,v 1.23 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,4 +75,5 @@ extern int inv_seek(LargeObjectDesc *obj_desc, int offset, int whence); extern int inv_tell(LargeObjectDesc *obj_desc); extern int inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes); extern int inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes); + #endif /* LARGE_OBJECT_H */ diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index c481b884a65..4dbecc07dfc 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lmgr.h,v 1.33 2001/10/25 05:50:10 momjian Exp $ + * $Id: lmgr.h,v 1.34 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,4 +61,5 @@ extern void UnlockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode); /* Lock an XID (used to wait for a transaction to finish) */ extern void XactLockTableInsert(TransactionId xid); extern void XactLockTableWait(TransactionId xid); + #endif /* LMGR_H */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index b5f20b3cb81..e21d0ff5068 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.57 2001/10/25 05:50:10 momjian Exp $ + * $Id: lock.h,v 1.58 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -251,4 +251,5 @@ extern void InitDeadLockChecking(void); extern void DumpLocks(void); extern void DumpAllLocks(void); #endif + #endif /* LOCK_H */ diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index 1725fc3b73d..02bb9b5b454 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lwlock.h,v 1.2 2001/10/25 05:50:10 momjian Exp $ + * $Id: lwlock.h,v 1.3 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,31 +25,31 @@ */ typedef enum LWLockId { - BufMgrLock, - LockMgrLock, - OidGenLock, - XidGenLock, - ShmemIndexLock, - SInvalLock, - FreeSpaceLock, - MMCacheLock, - WALInsertLock, - WALWriteLock, - ControlFileLock, - CheckpointLock, - CLogControlLock, + BufMgrLock, + LockMgrLock, + OidGenLock, + XidGenLock, + ShmemIndexLock, + SInvalLock, + FreeSpaceLock, + MMCacheLock, + WALInsertLock, + WALWriteLock, + ControlFileLock, + CheckpointLock, + CLogControlLock, - NumFixedLWLocks,/* must be last except for + NumFixedLWLocks, /* must be last except for * MaxDynamicLWLock */ - MaxDynamicLWLock = 1000000000 + MaxDynamicLWLock = 1000000000 } LWLockId; typedef enum LWLockMode { - LW_EXCLUSIVE, - LW_SHARED + LW_EXCLUSIVE, + LW_SHARED } LWLockMode; @@ -66,4 +66,5 @@ extern void LWLockReleaseAll(void); extern int NumLWLocks(void); extern int LWLockShmemSize(void); extern void CreateLWLocks(void); + #endif /* LWLOCK_H */ diff --git a/src/include/storage/off.h b/src/include/storage/off.h index a575b8d23ff..7af9032c8ee 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: off.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: off.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,4 +54,5 @@ typedef uint16 OffsetNumber; ((OffsetNumber) (1 + (offsetNumber))) #define OffsetNumberPrev(offsetNumber) \ ((OffsetNumber) (-1 + (offsetNumber))) + #endif /* OFF_H */ diff --git a/src/include/storage/page.h b/src/include/storage/page.h index baf7e3ed262..be2ab631f38 100644 --- a/src/include/storage/page.h +++ b/src/include/storage/page.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: page.h,v 1.9 2001/10/25 05:50:10 momjian Exp $ + * $Id: page.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ typedef Pointer Page; * True iff page is valid. */ #define PageIsValid(page) PointerIsValid(page) + #endif /* PAGE_H */ diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h index 7035fe74f51..e42c7fa521c 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pos.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: pos.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,4 +61,5 @@ typedef PositionIdData *PositionId; */ #define PositionIdGetOffsetNumber(positionId) \ ((OffsetNumber) *(positionId)) + #endif /* POS_H */ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 4be08aa3d27..43be9f043af 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: proc.h,v 1.51 2001/10/25 05:50:10 momjian Exp $ + * $Id: proc.h,v 1.52 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -152,4 +152,5 @@ extern void ProcSendSignal(BackendId procId); extern bool enable_sigalrm_interrupt(int delayms); extern bool disable_sigalrm_interrupt(void); + #endif /* PROC_H */ diff --git a/src/include/storage/relfilenode.h b/src/include/storage/relfilenode.h index 22af8343b53..c53dea8f399 100644 --- a/src/include/storage/relfilenode.h +++ b/src/include/storage/relfilenode.h @@ -18,4 +18,5 @@ typedef struct RelFileNode #define RelFileNodeEquals(node1, node2) \ ((node1).relNode == (node2).relNode && \ (node1).tblNode == (node2).tblNode) + #endif /* RELFILENODE_H */ diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index ef529a08269..37ee5694ac8 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: shmem.h,v 1.34 2001/10/25 05:50:10 momjian Exp $ + * $Id: shmem.h,v 1.35 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,4 +95,5 @@ extern void SHMQueueInsertBefore(SHM_QUEUE *queue, SHM_QUEUE *elem); extern Pointer SHMQueueNext(SHM_QUEUE *queue, SHM_QUEUE *curElem, Size linkOffset); extern bool SHMQueueEmpty(SHM_QUEUE *queue); + #endif /* SHMEM_H */ diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h index 21586b68bad..2e93d4293e8 100644 --- a/src/include/storage/sinval.h +++ b/src/include/storage/sinval.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sinval.h,v 1.23 2001/10/25 05:50:10 momjian Exp $ + * $Id: sinval.h,v 1.24 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,4 +78,5 @@ extern int CountActiveBackends(void); /* Use "struct PROC", not PROC, to avoid including proc.h here */ extern struct PROC *BackendIdGetProc(BackendId procId); + #endif /* SINVAL_H */ diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index e8d2967600b..aca1224e3b9 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sinvaladt.h,v 1.28 2001/10/25 05:50:10 momjian Exp $ + * $Id: sinvaladt.h,v 1.29 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -114,4 +114,5 @@ extern bool SIInsertDataEntry(SISeg *segP, SharedInvalidationMessage *data); extern int SIGetDataEntry(SISeg *segP, int backendId, SharedInvalidationMessage *data); extern void SIDelExpiredDataEntries(SISeg *segP); + #endif /* SINVALADT_H */ diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index 2564fd04a2d..9a10232eba9 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: smgr.h,v 1.32 2001/10/25 05:50:10 momjian Exp $ + * $Id: smgr.h,v 1.33 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -107,4 +107,5 @@ extern Datum smgrout(PG_FUNCTION_ARGS); extern Datum smgrin(PG_FUNCTION_ARGS); extern Datum smgreq(PG_FUNCTION_ARGS); extern Datum smgrne(PG_FUNCTION_ARGS); + #endif /* SMGR_H */ diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h index 9d13097915a..2ef7f6de8a6 100644 --- a/src/include/storage/spin.h +++ b/src/include/storage/spin.h @@ -40,7 +40,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: spin.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: spin.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,4 +73,5 @@ extern void CreateSpinlocks(void); + #endif /* SPIN_H */ diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 6e4fff9623b..9e81da48902 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.26 2001/10/25 05:50:10 momjian Exp $ + * $Id: dest.h,v 1.27 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,12 +55,12 @@ */ typedef enum { - None, /* results are discarded */ - Debug, /* results go to debugging output */ - Remote, /* results sent to frontend process */ - RemoteInternal, /* results sent to frontend process in + None, /* results are discarded */ + Debug, /* results go to debugging output */ + Remote, /* results sent to frontend process */ + RemoteInternal, /* results sent to frontend process in * internal (binary) form */ - SPI /* results sent to SPI manager */ + SPI /* results sent to SPI manager */ } CommandDest; /* ---------------- @@ -97,4 +97,5 @@ extern void ReceiveCopyBegin(void); extern void NullCommand(CommandDest dest); extern void ReadyForQuery(CommandDest dest); extern void UpdateCommandInfo(int operation, Oid lastoid, uint32 tuples); + #endif /* DEST_H */ diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h index b46c568d7db..901504bfd8a 100644 --- a/src/include/tcop/fastpath.h +++ b/src/include/tcop/fastpath.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fastpath.h,v 1.10 2001/10/25 05:50:10 momjian Exp $ + * $Id: fastpath.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,4 +14,5 @@ #define FASTPATH_H extern int HandleFunctionRequest(void); + #endif /* FASTPATH_H */ diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index 336e0323e04..29bd0f7e170 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pquery.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: pquery.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern void ProcessQuery(Query *parsetree, Plan *plan, CommandDest dest); extern EState *CreateExecutorState(void); extern Portal PreparePortal(char *portalName); + #endif /* PQUERY_H */ diff --git a/src/include/tcop/tcopdebug.h b/src/include/tcop/tcopdebug.h index 94be8307b35..69e2285db29 100644 --- a/src/include/tcop/tcopdebug.h +++ b/src/include/tcop/tcopdebug.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tcopdebug.h,v 1.7 2001/10/25 05:50:10 momjian Exp $ + * $Id: tcopdebug.h,v 1.8 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,5 @@ * #defines controlled by above definitions * ---------------------------------------------------------------- */ + #endif /* TCOPDEBUG_H */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index c170e7bb08b..404c88c605f 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.44 2001/10/25 05:50:10 momjian Exp $ + * $Id: tcopprot.h,v 1.45 2001/10/28 06:26:09 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -48,4 +48,5 @@ extern int PostgresMain(int argc, char *argv[], const char *username); extern void ResetUsage(void); extern void ShowUsage(void); extern FILE *StatFp; + #endif /* TCOPPROT_H */ diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 302fd21baa3..0cc271958f5 100644 --- a/src/include/tcop/utility.h +++ b/src/include/tcop/utility.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: utility.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: utility.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,5 @@ #include "executor/execdesc.h" extern void ProcessUtility(Node *parsetree, CommandDest dest); + #endif /* UTILITY_H */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index eb227b3ea93..838936e93d0 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.37 2001/10/25 05:50:10 momjian Exp $ + * $Id: acl.h,v 1.38 2001/10/28 06:26:09 momjian Exp $ * * NOTES * For backward-compatibility purposes we have to allow there @@ -207,4 +207,5 @@ extern bool pg_func_ownercheck(Oid userid, char *funcname, int nargs, Oid *arglist); extern bool pg_aggr_ownercheck(Oid userid, char *aggname, Oid basetypeID); + #endif /* ACL_H */ diff --git a/src/include/utils/ascii.h b/src/include/utils/ascii.h index cfead8bd1aa..01777c761bc 100644 --- a/src/include/utils/ascii.h +++ b/src/include/utils/ascii.h @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------- * ascii.h * - * $Id: ascii.h,v 1.6 2001/10/25 05:50:10 momjian Exp $ + * $Id: ascii.h,v 1.7 2001/10/28 06:26:09 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -23,4 +23,5 @@ extern Datum to_ascii_default(PG_FUNCTION_ARGS); extern char *pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int enc); #endif /* MULTIBYTE */ + #endif /* _ASCII_H_ */ diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h index 82df884b697..0d88ef96399 100644 --- a/src/include/utils/bit.h +++ b/src/include/utils/bit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bit.h,v 1.10 2001/10/25 05:50:10 momjian Exp $ + * $Id: bit.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,4 +34,5 @@ extern void BitArrayClearBit(BitArray bitArray, BitIndex bitIndex); * True iff the bit is set (1) in a bit array. */ extern bool BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex); + #endif /* BIT_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 006b1286f8e..fdcc877538e 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.169 2001/10/25 05:50:10 momjian Exp $ + * $Id: builtins.h,v 1.170 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -607,4 +607,5 @@ extern int32 type_maximum_size(Oid type_oid, int32 typemod); /* quote.c */ extern Datum quote_ident(PG_FUNCTION_ARGS); extern Datum quote_literal(PG_FUNCTION_ARGS); + #endif /* BUILTINS_H */ diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h index 49a70616e7b..07897fb0a5c 100644 --- a/src/include/utils/cash.h +++ b/src/include/utils/cash.h @@ -45,4 +45,5 @@ extern Datum cashlarger(PG_FUNCTION_ARGS); extern Datum cashsmaller(PG_FUNCTION_ARGS); extern Datum cash_words(PG_FUNCTION_ARGS); + #endif /* CASH_H */ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 18fd9473e49..00e4e5afe89 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.35 2001/10/25 05:50:10 momjian Exp $ + * $Id: catcache.h,v 1.36 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -102,4 +102,5 @@ extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex, extern void PrepareToInvalidateCacheTuple(Relation relation, HeapTuple tuple, void (*function) (int, Index, ItemPointer, Oid)); + #endif /* CATCACHE_H */ diff --git a/src/include/utils/date.h b/src/include/utils/date.h index 9773d40768f..dc83746acfa 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: date.h,v 1.15 2001/10/25 05:50:10 momjian Exp $ + * $Id: date.h,v 1.16 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -123,4 +123,5 @@ extern Datum timetz_zone(PG_FUNCTION_ARGS); extern Datum timetz_izone(PG_FUNCTION_ARGS); extern Datum timetz_pl_interval(PG_FUNCTION_ARGS); extern Datum timetz_mi_interval(PG_FUNCTION_ARGS); + #endif /* DATE_H */ diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index 57960c7699f..31d43636dc9 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datetime.h,v 1.24 2001/10/25 05:50:10 momjian Exp $ + * $Id: datetime.h,v 1.25 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -281,4 +281,5 @@ extern int DecodeUnits(int field, char *lowtoken, int *val); extern void ClearDateCache(bool); extern int j2day(int jd); + #endif /* DATETIME_H */ diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h index 7f6e1662e56..f67c3ae7a6e 100644 --- a/src/include/utils/datum.h +++ b/src/include/utils/datum.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datum.h,v 1.14 2001/10/25 05:50:10 momjian Exp $ + * $Id: datum.h,v 1.15 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,4 +45,5 @@ extern void datumFree(Datum value, bool typByVal, int typLen); */ extern bool datumIsEqual(Datum value1, Datum value2, bool typByVal, int typLen); + #endif /* DATUM_H */ diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h index 549fd878c40..7c1ec1ae986 100644 --- a/src/include/utils/dynahash.h +++ b/src/include/utils/dynahash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dynahash.h,v 1.9 2001/10/25 05:50:10 momjian Exp $ + * $Id: dynahash.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,4 +15,5 @@ #define DYNAHASH_H extern int my_log2(long num); + #endif /* DYNAHASH_H */ diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h index cf685ba7454..7bf248229a0 100644 --- a/src/include/utils/dynamic_loader.h +++ b/src/include/utils/dynamic_loader.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dynamic_loader.h,v 1.18 2001/10/25 05:50:10 momjian Exp $ + * $Id: dynamic_loader.h,v 1.19 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,5 @@ extern void *pg_dlopen(char *filename); extern PGFunction pg_dlsym(void *handle, char *funcname); extern void pg_dlclose(void *handle); extern char *pg_dlerror(void); + #endif /* DYNAMIC_LOADER_H */ diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 83309a285ad..9f537932b78 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.28 2001/10/25 05:50:10 momjian Exp $ + * $Id: elog.h,v 1.29 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,5 @@ elog(int lev, const char *fmt,...) __attribute__((format(printf, 2, 3))); extern int DebugFileOpen(void); + #endif /* ELOG_H */ diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h index e8d90c432da..b4d841e3017 100644 --- a/src/include/utils/exc.h +++ b/src/include/utils/exc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: exc.h,v 1.20 2001/10/25 05:50:10 momjian Exp $ + * $Id: exc.h,v 1.21 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,4 +84,5 @@ extern void ExcRaise(Exception *excP, */ extern void ExcAbort(const Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); + #endif /* EXC_H */ diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h index db1189842e6..8259b7a888e 100644 --- a/src/include/utils/excid.h +++ b/src/include/utils/excid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: excid.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: excid.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,5 @@ extern DLLIMPORT Exception InternalError; /* XXX inconsistent naming extern DLLIMPORT Exception SemanticError; /* XXX inconsistent naming * style */ extern DLLIMPORT Exception SystemError; /* XXX inconsistent naming style */ + #endif /* EXCID_H */ diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h index 04a7728bb53..e46eb90fe30 100644 --- a/src/include/utils/fcache.h +++ b/src/include/utils/fcache.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fcache.h,v 1.18 2001/10/25 05:50:10 momjian Exp $ + * $Id: fcache.h,v 1.19 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,4 +66,5 @@ typedef struct FunctionCache extern FunctionCachePtr init_fcache(Oid foid, int nargs, MemoryContext fcacheCxt); + #endif /* FCACHE_H */ diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h index afef186e274..e0c7852d394 100644 --- a/src/include/utils/fmgrtab.h +++ b/src/include/utils/fmgrtab.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fmgrtab.h,v 1.17 2001/10/25 05:50:10 momjian Exp $ + * $Id: fmgrtab.h,v 1.18 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,5 +35,6 @@ typedef struct extern const FmgrBuiltin fmgr_builtins[]; -extern const int fmgr_nbuiltins; /* number of entries in table */ +extern const int fmgr_nbuiltins; /* number of entries in table */ + #endif /* FMGRTAB_H */ diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h index 2fd297c9780..85aa54e62d2 100644 --- a/src/include/utils/formatting.h +++ b/src/include/utils/formatting.h @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------- * formatting.h * - * $Id: formatting.h,v 1.10 2001/10/25 05:50:10 momjian Exp $ + * $Id: formatting.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ * * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group @@ -32,4 +32,5 @@ extern Datum int4_to_char(PG_FUNCTION_ARGS); extern Datum int8_to_char(PG_FUNCTION_ARGS); extern Datum float4_to_char(PG_FUNCTION_ARGS); extern Datum float8_to_char(PG_FUNCTION_ARGS); + #endif diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 7518c351be0..52171db1523 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geo_decls.h,v 1.35 2001/10/25 05:50:10 momjian Exp $ + * $Id: geo_decls.h,v 1.36 2001/10/28 06:26:09 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -397,4 +397,5 @@ extern Datum positionsel(PG_FUNCTION_ARGS); extern Datum positionjoinsel(PG_FUNCTION_ARGS); extern Datum contsel(PG_FUNCTION_ARGS); extern Datum contjoinsel(PG_FUNCTION_ARGS); + #endif /* GEO_DECLS_H */ diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index ecb883d105e..c75eda18c98 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -4,7 +4,7 @@ * External declarations pertaining to backend/utils/misc/guc.c and * backend/utils/misc/guc-file.l * - * $Id: guc.h,v 1.11 2001/10/25 05:50:10 momjian Exp $ + * $Id: guc.h,v 1.12 2001/10/28 06:26:09 momjian Exp $ */ #ifndef GUC_H #define GUC_H @@ -39,11 +39,11 @@ */ typedef enum { - PGC_POSTMASTER, - PGC_SIGHUP, - PGC_BACKEND, - PGC_SUSET, - PGC_USERSET + PGC_POSTMASTER, + PGC_SIGHUP, + PGC_BACKEND, + PGC_SUSET, + PGC_USERSET } GucContext; @@ -72,4 +72,5 @@ extern bool Show_btree_build_stats; extern bool SQL_inheritance; extern bool Australian_timezones; + #endif /* GUC_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index 78ecc485caf..b8cbab43634 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hsearch.h,v 1.23 2001/10/25 05:50:10 momjian Exp $ + * $Id: hsearch.h,v 1.24 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,9 +31,9 @@ * tables, the initial directory size can be left at the default. */ #define DEF_SEGSIZE 256 -#define DEF_SEGSIZE_SHIFT 8/* must be log2(DEF_SEGSIZE) */ +#define DEF_SEGSIZE_SHIFT 8 /* must be log2(DEF_SEGSIZE) */ #define DEF_DIRSIZE 256 -#define DEF_FFACTOR 1/* default fill factor */ +#define DEF_FFACTOR 1 /* default fill factor */ #define PRIME1 37 /* for the hash function */ #define PRIME2 1048583 @@ -87,7 +87,7 @@ typedef struct HTAB HASHHDR *hctl; /* shared control information */ HASHSEGMENT *dir; /* directory of segment starts */ long (*hash) (void *key, int keysize); /* Hash Function */ - void *(*alloc) (Size); /* memory allocator */ + void *(*alloc) (Size); /* memory allocator */ MemoryContext hcxt; /* memory context if default allocator * used */ char *tabname; /* table name (for error messages) */ @@ -106,7 +106,7 @@ typedef struct HASHCTL long entrysize; /* total user element size in bytes */ long max_dsize; /* limit to dsize if directory size is * limited */ - void *(*alloc) (Size); /* memory allocation function */ + void *(*alloc) (Size); /* memory allocation function */ HASHSEGMENT *dir; /* directory of segment starts */ HASHHDR *hctl; /* location of header in shared mem */ MemoryContext hcxt; /* memory context to use for allocations */ @@ -132,11 +132,11 @@ typedef struct HASHCTL /* hash_search operations */ typedef enum { - HASH_FIND, - HASH_ENTER, - HASH_REMOVE, - HASH_FIND_SAVE, - HASH_REMOVE_SAVED + HASH_FIND, + HASH_ENTER, + HASH_REMOVE, + HASH_FIND_SAVE, + HASH_REMOVE_SAVED } HASHACTION; /* hash_seq status (should be considered an opaque type by callers) */ @@ -166,4 +166,5 @@ extern long hash_select_dirsize(long num_entries); */ extern long string_hash(void *key, int keysize); extern long tag_hash(void *key, int keysize); + #endif /* HSEARCH_H */ diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index d083fb9f002..252a9ece7a4 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: int8.h,v 1.29 2001/10/25 14:10:07 tgl Exp $ + * $Id: int8.h,v 1.30 2001/10/28 06:26:09 momjian Exp $ * * NOTES * These data types are supported on all 64-bit architectures, and may @@ -106,4 +106,5 @@ extern Datum dtoi8(PG_FUNCTION_ARGS); extern Datum int8_text(PG_FUNCTION_ARGS); extern Datum text_int8(PG_FUNCTION_ARGS); + #endif /* INT8_H */ diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index bc5b8d7fbe2..e025cc216fb 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: inval.h,v 1.21 2001/10/25 05:50:10 momjian Exp $ + * $Id: inval.h,v 1.22 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,5 @@ extern void CommandEndInvalidationMessages(bool isCommit); extern void RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple); extern void RelationMark4RollbackHeapTuple(Relation relation, HeapTuple tuple); + #endif /* INVAL_H */ diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h index 960a2d3abec..721a065dd3d 100644 --- a/src/include/utils/logtape.h +++ b/src/include/utils/logtape.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: logtape.h,v 1.5 2001/10/25 05:50:10 momjian Exp $ + * $Id: logtape.h,v 1.6 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,4 +38,5 @@ extern bool LogicalTapeSeek(LogicalTapeSet *lts, int tapenum, long blocknum, int offset); extern void LogicalTapeTell(LogicalTapeSet *lts, int tapenum, long *blocknum, int *offset); + #endif /* LOGTAPE_H */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 17e9c510686..ad5409ff088 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.37 2001/10/25 05:50:10 momjian Exp $ + * $Id: lsyscache.h,v 1.38 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,4 +56,5 @@ extern void free_attstatsslot(Oid atttype, extern int32 get_usesysid(const char *username); #define TypeIsToastable(typid) (get_typstorage(typid) != 'p') + #endif /* LSYSCACHE_H */ diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 03bb3b6e9f5..3f2ed80dd31 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.h,v 1.33 2001/10/25 05:50:10 momjian Exp $ + * $Id: nabstime.h,v 1.34 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -159,4 +159,5 @@ extern Datum timeofday(PG_FUNCTION_ARGS); extern AbsoluteTime GetCurrentAbsoluteTime(void); extern AbsoluteTime GetCurrentAbsoluteTimeUsec(int *usec); extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char **tzn); + #endif /* NABSTIME_H */ diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h index 1198b838ae3..eda8d18d076 100644 --- a/src/include/utils/numeric.h +++ b/src/include/utils/numeric.h @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.13 2001/10/25 05:50:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.14 2001/10/28 06:26:09 momjian Exp $ * * ---------- */ @@ -81,4 +81,5 @@ typedef NumericData *Numeric; #define PG_GETARG_NUMERIC(n) DatumGetNumeric(PG_GETARG_DATUM(n)) #define PG_GETARG_NUMERIC_COPY(n) DatumGetNumericCopy(PG_GETARG_DATUM(n)) #define PG_RETURN_NUMERIC(x) return NumericGetDatum(x) + #endif /* _PG_NUMERIC_H_ */ diff --git a/src/include/utils/pg_crc.h b/src/include/utils/pg_crc.h index e6d4b223fc8..a1e1da7340d 100644 --- a/src/include/utils/pg_crc.h +++ b/src/include/utils/pg_crc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_crc.h,v 1.4 2001/10/25 05:50:10 momjian Exp $ + * $Id: pg_crc.h,v 1.5 2001/10/28 06:26:09 momjian Exp $ */ #ifndef PG_CRC_H #define PG_CRC_H @@ -117,4 +117,5 @@ do { \ /* Constant table for CRC calculation */ extern const uint64 crc_table[]; #endif /* INT64_IS_BUSTED */ + #endif /* PG_CRC_H */ diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index a2a727290a8..d3d16d9780d 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -4,7 +4,7 @@ * The PostgreSQL locale utils. * * - * $Id: pg_locale.h,v 1.9 2001/10/25 05:50:10 momjian Exp $ + * $Id: pg_locale.h,v 1.10 2001/10/28 06:26:09 momjian Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -51,6 +51,6 @@ extern void PGLC_free_categories(PG_LocaleCategories *lc); *------ */ extern struct lconv *PGLC_localeconv(void); - #endif /* USE_LOCALE */ + #endif /* _PG_LOCALE_ */ diff --git a/src/include/utils/pg_lzcompress.h b/src/include/utils/pg_lzcompress.h index deaa8b1fb21..bc6dd8c3e04 100644 --- a/src/include/utils/pg_lzcompress.h +++ b/src/include/utils/pg_lzcompress.h @@ -1,7 +1,7 @@ /* ---------- * pg_lzcompress.h - * - * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.6 2001/10/25 05:50:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.7 2001/10/28 06:26:09 momjian Exp $ * * Definitions for the builtin LZ compressor * ---------- @@ -227,4 +227,5 @@ int pglz_decompress(PGLZ_Header *source, char *dest); */ extern int pglz_get_next_decomp_char_from_lzdata(PGLZ_DecompState *dstate); extern int pglz_get_next_decomp_char_from_plain(PGLZ_DecompState *dstate); + #endif /* _PG_LZCOMPRESS_H_ */ diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index 94b8e0911d2..8b12856e33d 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -4,7 +4,7 @@ * * Declarations for backend/utils/misc/ps_status.c * - * $Id: ps_status.h,v 1.21 2001/10/25 05:50:10 momjian Exp $ + * $Id: ps_status.h,v 1.22 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,5 @@ extern void init_ps_display(const char *username, const char *dbname, extern void set_ps_display(const char *activity); extern const char *get_ps_display(void); + #endif /* PS_STATUS_H */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 11c06069aa0..1e450d5e731 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.53 2001/10/25 05:50:10 momjian Exp $ + * $Id: rel.h,v 1.54 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -279,4 +279,5 @@ typedef Relation *RelationPtr; /* added to prevent circular dependency. bjm 1999/11/15 */ extern char *get_temp_rel_by_physicalname(const char *relname); + #endif /* REL_H */ diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index d4243c7c121..6906520107f 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relcache.h,v 1.27 2001/10/25 05:50:11 momjian Exp $ + * $Id: relcache.h,v 1.28 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,4 +72,5 @@ extern void DestroyDummyCaches(void); */ #define RELCACHE_INIT_FILENAME "pg_internal.init" + #endif /* RELCACHE_H */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index 5a7c44a6c6b..9e7d5ac5dab 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: selfuncs.h,v 1.2 2001/10/25 05:50:11 momjian Exp $ + * $Id: selfuncs.h,v 1.3 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,13 +21,13 @@ typedef enum { - Pattern_Type_Like, Pattern_Type_Like_IC, - Pattern_Type_Regex, Pattern_Type_Regex_IC + Pattern_Type_Like, Pattern_Type_Like_IC, + Pattern_Type_Regex, Pattern_Type_Regex_IC } Pattern_Type; typedef enum { - Pattern_Prefix_None, Pattern_Prefix_Partial, Pattern_Prefix_Exact + Pattern_Prefix_None, Pattern_Prefix_Partial, Pattern_Prefix_Exact } Pattern_Prefix_Status; @@ -73,4 +73,5 @@ extern Datum btcostestimate(PG_FUNCTION_ARGS); extern Datum rtcostestimate(PG_FUNCTION_ARGS); extern Datum hashcostestimate(PG_FUNCTION_ARGS); extern Datum gistcostestimate(PG_FUNCTION_ARGS); + #endif /* SELFUNCS_H */ diff --git a/src/include/utils/sets.h b/src/include/utils/sets.h index b620967b01a..07c827c03ba 100644 --- a/src/include/utils/sets.h +++ b/src/include/utils/sets.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sets.h,v 1.10 2001/10/25 05:50:11 momjian Exp $ + * $Id: sets.h,v 1.11 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,5 @@ extern Oid SetDefine(char *querystr, char *typename); extern Datum seteval(PG_FUNCTION_ARGS); + #endif /* SETS_H */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index e21081cc1ef..2ec1986e671 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: syscache.h,v 1.34 2001/10/25 05:50:11 momjian Exp $ + * $Id: syscache.h,v 1.35 2001/10/28 06:26:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,4 +72,5 @@ extern Oid GetSysCacheOid(int cacheId, extern Datum SysCacheGetAttr(int cacheId, HeapTuple tup, AttrNumber attributeNumber, bool *isNull); + #endif /* SYSCACHE_H */ diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h index 20dc75f9e97..fa3ed41cf32 100644 --- a/src/include/utils/temprel.h +++ b/src/include/utils/temprel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: temprel.h,v 1.18 2001/10/25 05:50:11 momjian Exp $ + * $Id: temprel.h,v 1.19 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,4 +29,5 @@ extern char *get_temp_rel_by_username(const char *user_relname); extern char *get_temp_rel_by_physicalname(const char *relname); #define is_temp_rel_name(relname) (get_temp_rel_by_username(relname) != NULL) + #endif /* TEMPREL_H */ diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 2272c33ff2d..3ac252b8cad 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: timestamp.h,v 1.22 2001/10/25 05:50:11 momjian Exp $ + * $Id: timestamp.h,v 1.23 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -180,4 +180,5 @@ extern void GetEpochTime(struct tm * tm); extern void isoweek2date(int woy, int *year, int *mon, int *mday); extern int date2isoweek(int year, int mon, int mday); + #endif /* TIMESTAMP_H */ diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 4ebcc094d78..5a6c832fddc 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.35 2001/10/25 05:50:11 momjian Exp $ + * $Id: tqual.h,v 1.36 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -90,14 +90,12 @@ extern bool ReferentialIntegritySnapshotOverride; /* Result codes for HeapTupleSatisfiesVacuum */ typedef enum { - HEAPTUPLE_DEAD, /* tuple is dead and deletable */ - HEAPTUPLE_LIVE, /* tuple is live (committed, no deleter) */ - HEAPTUPLE_RECENTLY_DEAD, /* tuple is dead, but not - * deletable yet */ - HEAPTUPLE_INSERT_IN_PROGRESS, /* inserting xact is still - * in progress */ - HEAPTUPLE_DELETE_IN_PROGRESS /* deleting xact is still - * in progress */ + HEAPTUPLE_DEAD, /* tuple is dead and deletable */ + HEAPTUPLE_LIVE, /* tuple is live (committed, no deleter) */ + HEAPTUPLE_RECENTLY_DEAD, /* tuple is dead, but not deletable yet */ + HEAPTUPLE_INSERT_IN_PROGRESS, /* inserting xact is still in + * progress */ + HEAPTUPLE_DELETE_IN_PROGRESS /* deleting xact is still in progress */ } HTSV_Result; extern bool HeapTupleSatisfiesItself(HeapTupleHeader tuple); @@ -112,4 +110,5 @@ extern HTSV_Result HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, extern Snapshot GetSnapshotData(bool serializable); extern void SetQuerySnapshot(void); extern void FreeXactSnapshot(void); + #endif /* TQUAL_H */ diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index 11137219288..f6baea7412a 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplesort.h,v 1.9 2001/10/25 05:50:11 momjian Exp $ + * $Id: tuplesort.h,v 1.10 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,10 +83,10 @@ extern void tuplesort_restorepos(Tuplesortstate *state); */ typedef enum { - SORTFUNC_LT, /* raw "<" operator */ - SORTFUNC_REVLT, /* raw "<" operator, but reverse NULLs */ - SORTFUNC_CMP, /* -1 / 0 / 1 three-way comparator */ - SORTFUNC_REVCMP /* 1 / 0 / -1 (reversed) 3-way comparator */ + SORTFUNC_LT, /* raw "<" operator */ + SORTFUNC_REVLT, /* raw "<" operator, but reverse NULLs */ + SORTFUNC_CMP, /* -1 / 0 / 1 three-way comparator */ + SORTFUNC_REVCMP /* 1 / 0 / -1 (reversed) 3-way comparator */ } SortFunctionKind; extern void SelectSortFunction(Oid sortOperator, @@ -101,4 +101,5 @@ extern void SelectSortFunction(Oid sortOperator, extern int32 ApplySortFunction(FmgrInfo *sortFunction, SortFunctionKind kind, Datum datum1, bool isNull1, Datum datum2, bool isNull2); + #endif /* TUPLESORT_H */ diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h index 39d17461085..1e253d178b4 100644 --- a/src/include/utils/tuplestore.h +++ b/src/include/utils/tuplestore.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplestore.h,v 1.4 2001/10/25 05:50:11 momjian Exp $ + * $Id: tuplestore.h,v 1.5 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,4 +56,5 @@ extern void tuplestore_end(Tuplestorestate *state); extern void tuplestore_rescan(Tuplestorestate *state); extern void tuplestore_markpos(Tuplestorestate *state); extern void tuplestore_restorepos(Tuplestorestate *state); + #endif /* TUPLESTORE_H */ diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h index b4fedf18a77..27d1c4fa8fc 100644 --- a/src/include/utils/varbit.h +++ b/src/include/utils/varbit.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: varbit.h,v 1.12 2001/10/25 05:50:11 momjian Exp $ + * $Id: varbit.h,v 1.13 2001/10/28 06:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,4 +89,5 @@ extern Datum bitoctetlength(PG_FUNCTION_ARGS); extern Datum bitfromint4(PG_FUNCTION_ARGS); extern Datum bittoint4(PG_FUNCTION_ARGS); extern Datum bitposition(PG_FUNCTION_ARGS); + #endif |