Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0020e87

Browse files
committed
Another directory that compiles with no errors, and few warnings
1 parent1d0dd47 commit0020e87

File tree

24 files changed

+109
-57
lines changed

24 files changed

+109
-57
lines changed

‎src/backend/utils/adt/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for utils/adt
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.2 1996/11/03 06:52:59 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.3 1996/11/06 10:30:35 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../../port/$(PORTNAME)\
14+
INCLUDE_OPT = -I../..\
15+
-I../../port/$(PORTNAME)\
1516
-I../../../include
1617

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/utils/adt/acl.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.4 1996/11/0606:49:34 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.5 1996/11/0610:30:36 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include<ctype.h>
1515
#include<string.h>
1616
#include"postgres.h"
17+
18+
#include<utils/memutils.h>
1719
#include"utils/acl.h"
1820
#include"catalog/pg_user.h"
1921
#include"utils/syscache.h"
20-
#include"utils/palloc.h"
2122
#include"miscadmin.h"
2223

2324
staticchar*getid(char*s,char*n);

‎src/backend/utils/adt/arrayfuncs.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.8 1996/11/0606:49:36 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.9 1996/11/0610:30:38 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include<ctype.h>
1616
#include<stdio.h>
17+
#include<string.h>
1718

1819
#include"postgres.h"
1920

2021
#include"catalog/catalog.h"
2122
#include"catalog/pg_type.h"
2223

2324
#include"utils/syscache.h"
24-
#include"utils/palloc.h"
2525
#include"utils/memutils.h"
2626
#include"storage/fd.h"/* for SEEK_ */
2727
#include"fmgr.h"
@@ -783,7 +783,10 @@ array_clip(ArrayType *array,
783783
mda_get_range(n,span,lowerIndx,upperIndx);
784784

785785
if (ARR_IS_LO(array)) {
786-
char*lo_name,*newname;
786+
#ifdefLOARRAY
787+
char*lo_name;
788+
#endif
789+
char*newname;
787790
intfd,newfd,isDestLO= true,rsize;
788791

789792
if (len<0)
@@ -906,12 +909,13 @@ array_set(ArrayType *array,
906909

907910
if (ARR_IS_LO(array)) {
908911
intfd;
909-
char*lo_name;
910912
structvarlena*v;
911913

912914
/* We are assuming fixed element lengths here */
913915
offset *=elmlen;
914916
#ifdefLOARRAY
917+
char*lo_name;
918+
915919
lo_name=ARR_DATA_PTR(array);
916920
if ((fd=LOopen(lo_name,ARR_IS_INV(array)?INV_WRITE:O_WRONLY))<0)
917921
return((char*)array);
@@ -1013,10 +1017,11 @@ array_assgn(ArrayType *array,
10131017
elog(WARN,"lowerIndex larger than upperIndx");
10141018

10151019
if (ARR_IS_LO(array)) {
1016-
char*lo_name;
10171020
intfd,newfd;
10181021

10191022
#ifdefLOARRAY
1023+
char*lo_name;
1024+
10201025
lo_name= (char*)ARR_DATA_PTR(array);
10211026
if ((fd=LOopen(lo_name,ARR_IS_INV(array)?INV_WRITE:O_WRONLY))<0)
10221027
return((char*)array);

‎src/backend/utils/adt/chunk.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,31 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.2 1996/11/0606:49:43 scrappy Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.3 1996/11/0610:30:40 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#include<ctype.h>
1414
#include"postgres.h"
15+
16+
#include<libpq/be-fsstubs.h>
1517
#include"utils/memutils.h"
1618
#include"libpq/libpq-fs.h"
1719

1820
#include"storage/fd.h"/* for SEEK_ */
1921

2022
#include"catalog/pg_type.h"
2123

22-
#include"utils/palloc.h"
2324
#include"fmgr.h"
2425
#include"utils/array.h"
2526

2627
#include"optimizer/internal.h"
28+
#ifndefHAVE_MEMMOVE
29+
# include<regex/utils.h>
30+
#else
31+
# include<string.h>
32+
#endif
33+
2734

2835
#defineINFTY 500000000
2936
#defineMANY 10000

‎src/backend/utils/adt/date.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.2 1996/11/0606:49:44 scrappy Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.3 1996/11/0610:30:44 scrappy Exp $
1313
*
1414
* NOTES
1515
* This code is actually (almost) unused.
@@ -88,10 +88,6 @@
8888
#defineABSTIMEMIN(t1,t2) abstimele((t1),(t2)) ? (t1) : (t2)
8989
#defineABSTIMEMAX(t1,t2) abstimelt((t1),(t2)) ? (t2) : (t1)
9090

91-
staticchar*month_name[]= {
92-
"Jan","Feb","Mar","Apr","May","Jun","Jul",
93-
"Aug","Sep","Oct","Nov","Dec" };
94-
9591
staticchar*unit_tab[]= {
9692
"second","seconds","minute","minutes",
9793
"hour","hours","day","days","week","weeks",
@@ -113,8 +109,6 @@ staticintunit_max_quantity[] = {
113109

114110

115111
structtimeb*TimeDifferenceFromGMT=NULL;
116-
staticboolTimeDiffIsInited= false;
117-
staticchar*timezonename=NULL;
118112

119113
/*
120114
* Function prototypes -- internal to this file only

‎src/backend/utils/adt/filename.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.3 1996/11/03 06:53:05 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.4 1996/11/06 10:30:51 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -21,7 +21,7 @@
2121
#include<sys/param.h>
2222

2323
#include"postgres.h"
24-
#include"utils/palloc.h"
24+
#include<miscadmin.h>
2525
#include"utils/builtins.h"/* where function declarations go */
2626

2727
char*

‎src/backend/utils/adt/int.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.2 1996/11/0606:49:49 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.3 1996/11/0610:30:55 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -28,11 +28,11 @@
2828
* XXX makes massive and possibly unwarranted type promotion assumptions.
2929
* fix me when we figure out what we want to do about ANSIfication...
3030
*/
31+
#include<stdio.h>
3132

3233
#include"postgres.h"
3334
#include"fmgr.h"
3435
#include"utils/builtins.h"/* where the declarations go */
35-
#include"utils/palloc.h"
3636

3737
/*****************************************************************************
3838
* USER I/O ROUTINES *

‎src/backend/utils/adt/numutils.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.5 1996/11/0606:49:54 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.6 1996/11/0610:30:58 scrappy Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -19,6 +19,11 @@
1919
#include<math.h>
2020
#include"postgres.h"
2121
#include"utils/builtins.h"/* where the declarations go */
22+
#ifndefHAVE_MEMMOVE
23+
# include<regex/utils.h>
24+
#else
25+
# include<string.h>
26+
#endif
2227

2328
int32
2429
pg_atoi(char*s,intsize,intc)

‎src/backend/utils/adt/oid.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.2 1996/11/0606:49:55 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.3 1996/11/0610:31:01 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14+
15+
#include<stdio.h>
16+
1417
#include"postgres.h"
15-
#include"utils/palloc.h"
1618
#include"utils/builtins.h"/* where function declarations go */
1719

1820
/*****************************************************************************

‎src/backend/utils/adt/regexp.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.3 1996/11/0606:49:58 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.4 1996/11/0610:31:04 scrappy Exp $
1111
*
1212
* Alistair Crooks added the code for the regex caching
1313
*agc - cached the regular expressions used - there's a good chance
@@ -29,7 +29,9 @@
2929
*/
3030
#include<string.h>
3131
#include"postgres.h"/* postgres system include file */
32-
#include"utils/palloc.h"
32+
33+
#include<regex/regex.h>
34+
3335
#include"utils/builtins.h"/* where the function declarations go */
3436

3537
#if defined(DISABLE_XOPEN_NLS)

‎src/backend/utils/cache/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for utils/cache
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.2 1996/11/03 06:53:14 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.3 1996/11/06 10:31:16 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../../port/$(PORTNAME)\
14+
INCLUDE_OPT = -I../..\
15+
-I../../port/$(PORTNAME)\
1516
-I../../../include
1617

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/utils/cache/fcache.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.2 1996/11/03 06:53:17 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.3 1996/11/06 10:31:22 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include"postgres.h"
15+
16+
#include<nodes/parsenodes.h>
17+
#include<fmgr.h>
18+
1519
#include"access/htup.h"
1620
#include"utils/catcache.h"
1721
#include"utils/syscache.h"
@@ -22,9 +26,13 @@
2226
#include"parser/parsetree.h"/* for getrelname() */
2327
#include"utils/builtins.h"
2428
#include"utils/fcache.h"
25-
#include"utils/palloc.h"
2629
#include"nodes/primnodes.h"
2730
#include"nodes/execnodes.h"
31+
#ifndefHAVE_MEMMOVE
32+
# include<regex/utils.h>
33+
#else
34+
# include<string.h>
35+
#endif
2836

2937
staticOidGetDynamicFuncArgType(Var*arg,ExprContext*econtext);
3038
staticFunctionCachePtrinit_fcache(Oidfoid,

‎src/backend/utils/cache/inval.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.1.1.1 1996/07/09 06:22:06 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.2 1996/11/06 10:31:24 scrappy Exp $
1111
*
1212
* Note - this code is real crufty...
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
1616
#include"postgres.h"
17+
18+
#include<miscadmin.h>
19+
1720
#include"access/heapam.h"/* XXX to support hacks below */
1821
#include"access/htup.h"
1922
#include"catalog/catalog.h"
@@ -23,7 +26,6 @@
2326
#include"storage/sinval.h"
2427
#include"utils/catcache.h"
2528
#include"utils/inval.h"
26-
#include"utils/elog.h"
2729
#include"utils/rel.h"
2830
#include"utils/relcache.h"
2931
#include"catalog/catname.h"/* XXX to support hacks below */

‎src/backend/utils/cache/relcache.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.3 1996/10/24 07:55:29 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.4 1996/11/06 10:31:27 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -37,15 +37,15 @@
3737
#include"postgres.h"
3838
#include"miscadmin.h"
3939

40-
#include"access/attnum.h"
40+
#include<storage/smgr.h>
41+
4142
#include"access/genam.h"
4243
#include"access/heapam.h"
4344
#include"access/htup.h"
4445
#include"access/istrat.h"
4546
#include"access/itup.h"
4647
#include"access/skey.h"
4748
#include"utils/builtins.h"
48-
#include"utils/tqual.h"/* for NowTimeQual */
4949
#include"access/tupdesc.h"
5050
#include"access/tupmacs.h"
5151
#include"access/xact.h"
@@ -54,17 +54,14 @@
5454
#include"storage/fd.h"/* for SEEK_ */
5555
#include"storage/lmgr.h"
5656
#include"storage/bufmgr.h"
57-
5857

5958
#include"lib/hasht.h"
6059

6160
#include"utils/memutils.h"
62-
#include"utils/elog.h"
6361
#include"utils/mcxt.h"
6462
#include"utils/rel.h"
6563
#include"utils/relcache.h"
6664
#include"utils/hsearch.h"
67-
#include"utils/palloc.h"
6865
#include"utils/relcache.h"
6966

7067
#include"catalog/catname.h"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp