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

Commit 3406901

Browse files
bmomjianbmomjian
committed
Move some system includes into c.h, and remove duplicates.
1 parent c62b8a6 commit 3406901

File tree

262 files changed

+265
-883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+265
-883
lines changed

‎src/backend/access/common/heaptuple.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.56 1999/07/16 04:58:21 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.57 1999/07/17 20:16:35 momjian Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -22,12 +22,6 @@
2222
#include "access/heapam.h"
2323
#include "catalog/pg_type.h"
2424

25-
#ifndef HAVE_MEMMOVE
26-
#include <regex/utils.h>
27-
#else
28-
#include <string.h>
29-
#endif
30-
3125
/* Used by heap_getattr() macro, for speed */
3226
long heap_sysoffset[] = {
3327
/* Only the first one is pass-by-ref, and is handled specially in the macro */

‎src/backend/access/common/indextuple.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.36 1999/07/16 04:58:22 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.37 1999/07/17 20:16:35 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -19,11 +19,6 @@
1919
#include "access/itup.h"
2020
#include "catalog/pg_type.h"
2121

22-
#ifndef HAVE_MEMMOVE
23-
#include <regex/utils.h>
24-
#else
25-
#include <string.h>
26-
#endif
2722

2823
/* ----------------------------------------------------------------
2924
* index_ tuple interface routines

‎src/backend/access/common/printtup.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.48 1999/07/15 22:38:32 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.49 1999/07/17 20:16:35 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

16-
#include <string.h>
1716

1817
#include "postgres.h"
1918

‎src/backend/access/common/tupdesc.c

+1-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.53 1999/07/16 04:58:22 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.54 1999/07/17 20:16:36 momjian Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -16,8 +16,6 @@
1616
*-------------------------------------------------------------------------
1717
*/
1818

19-
#include <stdio.h>
20-
2119
#include "postgres.h"
2220

2321
#include "catalog/pg_type.h"
@@ -26,11 +24,6 @@
2624
#include "utils/builtins.h"
2725
#include "utils/syscache.h"
2826

29-
#ifndef HAVE_MEMMOVE
30-
#include <regex/utils.h>
31-
#else
32-
#include <string.h>
33-
#endif
3427

3528
/* ----------------------------------------------------------------
3629
* CreateTemplateTupleDesc

‎src/backend/access/gist/gist.c

-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
#include "executor/executor.h"
2323
#include "utils/syscache.h"
2424

25-
#ifndef HAVE_MEMMOVE
26-
#include <regex/utils.h>
27-
#else
28-
#include <string.h>
29-
#endif
3025

3126
/* non-export function prototypes */
3227
static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,

‎src/backend/access/gist/gistget.c

-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
#include "access/gist.h"
1717
#include "executor/execdebug.h"
1818

19-
#ifndef HAVE_MEMMOVE
20-
#include <regex/utils.h>
21-
#else
22-
#include <string.h>
23-
#endif
2419

2520

2621
static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n,

‎src/backend/access/gist/gistscan.c

-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
#include "access/gist.h"
1717
#include "access/gistscan.h"
1818

19-
#ifndef HAVE_MEMMOVE
20-
#include <regex/utils.h>
21-
#else
22-
#include <string.h>
23-
#endif
2419

2520
/* routines defined and used here */
2621
static void gistregscan(IndexScanDesc s);

‎src/backend/access/hash/hash.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.29 1999/07/16 04:58:24 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.30 1999/07/17 20:16:38 momjian Exp $
1111
*
1212
* NOTES
1313
* This file contains only the public interface routines.
@@ -24,11 +24,6 @@
2424
#include "executor/executor.h"
2525
#include "miscadmin.h"
2626

27-
#ifndef HAVE_MEMMOVE
28-
#include <regex/utils.h>
29-
#else
30-
#include <string.h>
31-
#endif
3227

3328
bool BuildingHash = false;
3429

‎src/backend/access/hash/hashovfl.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.23 1999/07/16 04:58:25 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.24 1999/07/17 20:16:38 momjian Exp $
1111
*
1212
* NOTES
1313
* Overflow pages look like ordinary relation pages.
@@ -18,11 +18,6 @@
1818

1919
#include "access/hash.h"
2020

21-
#ifndef HAVE_MEMMOVE
22-
#include <regex/utils.h>
23-
#else
24-
#include <string.h>
25-
#endif
2621

2722
static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp);
2823
static uint32 _hash_firstfreebit(uint32 map);

‎src/backend/access/hash/hashpage.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.23 1999/07/16 04:58:25 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.24 1999/07/17 20:16:39 momjian Exp $
1111
*
1212
* NOTES
1313
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -29,11 +29,6 @@
2929
#include "access/hash.h"
3030
#include "miscadmin.h"
3131

32-
#ifndef HAVE_MEMMOVE
33-
#include <regex/utils.h>
34-
#else
35-
#include <string.h>
36-
#endif
3732

3833
static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access);
3934
static void _hash_unsetpagelock(Relation rel, BlockNumber blkno, int access);

‎src/backend/access/hash/hashsearch.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.20 1999/07/16 04:58:25 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.21 1999/07/17 20:16:39 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -16,11 +16,6 @@
1616

1717
#include "access/hash.h"
1818

19-
#ifndef HAVE_MEMMOVE
20-
#include <regex/utils.h>
21-
#else
22-
#include <string.h>
23-
#endif
2419

2520
/*
2621
* _hash_search() -- Finds the page/bucket that the contains the

‎src/backend/access/hash/hashutil.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.20 1999/07/16 04:58:25 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.21 1999/07/17 20:16:39 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,11 +17,6 @@
1717
#include "access/hash.h"
1818
#include "access/iqual.h"
1919

20-
#ifndef HAVE_MEMMOVE
21-
#include <regex/utils.h>
22-
#else
23-
#include <string.h>
24-
#endif
2520

2621
ScanKey
2722
_hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)

‎src/backend/access/heap/heapam.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.51 1999/07/16 04:58:26 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.52 1999/07/17 20:16:39 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -85,11 +85,6 @@
8585
#include "utils/inval.h"
8686
#include "utils/relcache.h"
8787

88-
#ifndef HAVE_MEMMOVE
89-
#include <regex/utils.h>
90-
#else
91-
#include <string.h>
92-
#endif
9388

9489
/* ----------------------------------------------------------------
9590
* heap support routines

‎src/backend/access/heap/stats.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,20 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.20 1999/07/16 04:58:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.21 1999/07/17 20:16:40 momjian Exp $
1111
*
1212
* NOTES
1313
* initam should be moved someplace else.
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
1717

18-
#include <stdio.h>
1918
#include <time.h>
2019

2120
#include "postgres.h"
2221

2322
#include "access/heapam.h"
2423

25-
#ifndef HAVE_MEMMOVE
26-
#include <regex/utils.h>
27-
#else
28-
#include <string.h>
29-
#endif
3024

3125
static void InitHeapAccessStatistics(void);
3226

‎src/backend/access/index/genam.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.20 1999/07/16 04:58:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.21 1999/07/17 20:16:40 momjian Exp $
1111
*
1212
* NOTES
1313
* many of the old access method routines have been turned into
@@ -47,11 +47,6 @@
4747
#include "postgres.h"
4848
#include "access/genam.h"
4949

50-
#ifndef HAVE_MEMMOVE
51-
#include <regex/utils.h>
52-
#else
53-
#include <string.h>
54-
#endif
5550

5651
/* ----------------------------------------------------------------
5752
* general access method routines

‎src/backend/access/nbtree/nbtcompare.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.26 1999/07/15 23:02:59 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.27 1999/07/17 20:16:41 momjian Exp $
1111
*
1212
* NOTES
1313
* These functions are stored in pg_amproc. For each operator class
@@ -20,7 +20,6 @@
2020
*-------------------------------------------------------------------------
2121
*/
2222

23-
#include <string.h>
2423

2524
#include "postgres.h"
2625

‎src/backend/access/nbtree/nbtinsert.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.47 1999/07/16 04:58:29 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.48 1999/07/17 20:16:42 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,11 +17,6 @@
1717
#include "access/heapam.h"
1818
#include "access/nbtree.h"
1919

20-
#ifndef HAVE_MEMMOVE
21-
#include <regex/utils.h>
22-
#else
23-
#include <string.h>
24-
#endif
2520

2621
static InsertIndexResult _bt_insertonpg(Relation rel, Buffer buf, BTStack stack, int keysz, ScanKey scankey, BTItem btitem, BTItem afteritem);
2722
static Buffer _bt_split(Relation rel, Buffer buf, OffsetNumber firstright);

‎src/backend/access/nbtree/nbtpage.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.29 1999/07/16 04:58:29 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.30 1999/07/17 20:16:42 momjian Exp $
1212
*
1313
* NOTES
1414
* Postgres btree pages look like ordinary relation pages. The opaque
@@ -19,15 +19,9 @@
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
22-
#include <stdio.h>
2322
#include <time.h>
2423

2524
#include "postgres.h"
26-
#ifndef HAVE_MEMMOVE
27-
#include <regex/utils.h>
28-
#else
29-
#include <string.h>
30-
#endif
3125

3226
#include "access/nbtree.h"
3327
#include "miscadmin.h"

‎src/backend/access/nbtree/nbtree.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.44 1999/07/16 04:58:30 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.45 1999/07/17 20:16:43 momjian Exp $
1212
*
1313
* NOTES
1414
* This file contains only the public interface routines.
@@ -17,11 +17,6 @@
1717
*/
1818

1919
#include "postgres.h"
20-
#ifndef HAVE_MEMMOVE
21-
#include <regex/utils.h>
22-
#else
23-
#include <string.h>
24-
#endif
2520

2621
#include "access/genam.h"
2722
#include "access/heapam.h"

0 commit comments

Comments
 (0)