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

Commit9fc7250

Browse files
author
Bryan Henderson
committed
Make compile on AIX, Alpha OSF. Thanks Darren King, Igor Notanzon.
1 parent290d3b5 commit9fc7250

File tree

6 files changed

+77
-63
lines changed

6 files changed

+77
-63
lines changed

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.11 1996/12/06 09:41:45 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.12 1996/12/15 09:05:10 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -27,11 +27,19 @@
2727
#endif
2828

2929

30-
staticBTStack_bt_searchr(Relationrel,intkeysz,ScanKeyscankey,Buffer*bufP,BTStackstack_in);
31-
staticOffsetNumber_bt_firsteq(Relationrel,TupleDescitupdesc,Pagepage,Sizekeysz,ScanKeyscankey,OffsetNumberoffnum);
32-
int_bt_compare(Relationrel,TupleDescitupdesc,Pagepage,intkeysz,ScanKeyscankey,OffsetNumberoffnum);
33-
staticbool_bt_twostep(IndexScanDescscan,Buffer*bufP,ScanDirectiondir);
34-
staticRetrieveIndexResult_bt_endpoint(IndexScanDescscan,ScanDirectiondir);
30+
staticBTStack
31+
_bt_searchr(Relationrel,intkeysz,ScanKeyscankey,
32+
Buffer*bufP,BTStackstack_in);
33+
staticOffsetNumber
34+
_bt_firsteq(Relationrel,TupleDescitupdesc,Pagepage,
35+
Sizekeysz,ScanKeyscankey,OffsetNumberoffnum);
36+
int
37+
_bt_compare(Relationrel,TupleDescitupdesc,Pagepage,
38+
intkeysz,ScanKeyscankey,OffsetNumberoffnum);
39+
staticbool
40+
_bt_twostep(IndexScanDescscan,Buffer*bufP,ScanDirectiondir);
41+
staticRetrieveIndexResult
42+
_bt_endpoint(IndexScanDescscan,ScanDirectiondir);
3543

3644
/*
3745
* _bt_search() -- Search for a scan key in the index.
@@ -472,7 +480,7 @@ _bt_compare(Relation rel,
472480
elog(WARN,"_bt_compare: invalid comparison to high key");
473481
}
474482

475-
#ifdef0
483+
#if0
476484
/*
477485
* We just have to belive that right answer will not
478486
* break anything. I've checked code and all seems to be ok.
@@ -1130,7 +1138,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
11301138
* Scanning in BackwardScanDirection is not understandable at all.
11311139
* Well - new stuff. - vadim 12/06/96
11321140
*/
1133-
#ifdef0
1141+
#if0
11341142
if (PageIsEmpty(page)||start>maxoff) {
11351143
ItemPointerSet(current,blkno,maxoff);
11361144
if (!_bt_step(scan,&buf,BackwardScanDirection))
@@ -1166,7 +1174,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
11661174
* empty why do scanning in ForwardScanDirection ???
11671175
* Well - new stuff. - vadim 12/06/96
11681176
*/
1169-
#ifdef0
1177+
#if0
11701178
if (PageIsEmpty(page)) {
11711179
ItemPointerSet(current,blkno,FirstOffsetNumber);
11721180
if (!_bt_step(scan,&buf,ForwardScanDirection))

‎src/backend/port/aix/mkldexport.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818

1919
# setting this to nm -B might be better
20-
NM =/usr/ucb/nm
20+
NM=/usr/ucb/nm
2121

2222
CMDNAME=`basename$0`
2323
if [-z"$1" ];then

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.7 1996/11/0805:59:45 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.8 1996/12/15 09:05:35 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include<stdio.h>
1515
#include<ctype.h>
1616
#include<string.h>
17+
#include<sys/timeb.h>
1718
#include<sys/types.h>
1819
#include"postgres.h"
1920
#include"access/xact.h"

‎src/include/config.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
#endif
1616
#endif/* !defined(sparc_solaris) */
1717

18+
#if defined(aix)
19+
#defineTERMIOS_H_LOCATION <termios.h>
20+
#else
21+
#defineTERMIOS_H_LOCATION <sys/termios.h>
22+
#endif
23+
1824
#defineHAVE_MEMMOVE
1925

2026
#if defined(aix)
@@ -39,6 +45,7 @@
3945
# defineNEED_UNION_SEMUN
4046
# define SB_PAD 40
4147
# defineHAS_TEST_AND_SET
48+
include<sys/mman.h>/* for msemaphore */
4249
typedefmsemaphoreslock_t;
4350
#endif
4451

‎src/include/regex/regex.h

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*-
22
* Copyright (c) 1992 Henry Spencer.
33
* Copyright (c) 1992, 1993
4-
*The Regents of the University of California. All rights reserved.
4+
*The Regents of the University of California. All rights reserved.
55
*
66
* This code is derived from software contributed to Berkeley by
77
* Henry Spencer of the University of Toronto.
@@ -16,8 +16,8 @@
1616
* documentation and/or other materials provided with the distribution.
1717
* 3. All advertising materials mentioning features or use of this software
1818
* must display the following acknowledgement:
19-
*This product includes software developed by the University of
20-
*California, Berkeley and its contributors.
19+
*This product includes software developed by the University of
20+
*California, Berkeley and its contributors.
2121
* 4. Neither the name of the University nor the names of its contributors
2222
* may be used to endorse or promote products derived from this software
2323
* without specific prior written permission.
@@ -34,73 +34,71 @@
3434
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
3535
* SUCH DAMAGE.
3636
*
37-
*@(#)regex.h8.2 (Berkeley) 1/3/94
37+
*@(#)regex.h8.2 (Berkeley) 1/3/94
3838
*/
3939

4040
#ifndef_REGEX_H_
41-
#define_REGEX_H_
41+
#define_REGEX_H_
4242

4343
#include<sys/types.h>
4444

4545
/* types */
4646
typedefoff_tregoff_t;
4747

4848
typedefstruct {
49-
intre_magic;
50-
size_tre_nsub;/* number of parenthesized subexpressions */
51-
__constchar*re_endp;/* end pointer for REG_PEND */
52-
structre_guts*re_g;/* none of your business :-) */
49+
intre_magic;
50+
size_tre_nsub;/* number of parenthesized subexpressions */
51+
constchar*re_endp;/* end pointer for REG_PEND */
52+
structre_guts*re_g;/* none of your business :-) */
5353
}regex_t;
5454

5555
typedefstruct {
56-
regoff_trm_so;/* start of match */
57-
regoff_trm_eo;/* end of match */
56+
regoff_trm_so;/* start of match */
57+
regoff_trm_eo;/* end of match */
5858
}regmatch_t;
5959

6060
/* regcomp() flags */
61-
#defineREG_BASIC0000
62-
#defineREG_EXTENDED0001
63-
#defineREG_ICASE0002
64-
#defineREG_NOSUB0004
65-
#defineREG_NEWLINE0010
66-
#defineREG_NOSPEC0020
67-
#defineREG_PEND0040
68-
#defineREG_DUMP0200
61+
#defineREG_BASIC0000
62+
#defineREG_EXTENDED0001
63+
#defineREG_ICASE0002
64+
#defineREG_NOSUB0004
65+
#defineREG_NEWLINE0010
66+
#defineREG_NOSPEC0020
67+
#defineREG_PEND0040
68+
#defineREG_DUMP0200
6969

7070
/* regerror() flags */
71-
#defineREG_NOMATCH 1
72-
#defineREG_BADPAT 2
73-
#defineREG_ECOLLATE 3
74-
#defineREG_ECTYPE 4
75-
#defineREG_EESCAPE 5
76-
#defineREG_ESUBREG 6
77-
#defineREG_EBRACK 7
78-
#defineREG_EPAREN 8
79-
#defineREG_EBRACE 9
80-
#defineREG_BADBR10
81-
#defineREG_ERANGE11
82-
#defineREG_ESPACE12
83-
#defineREG_BADRPT13
84-
#defineREG_EMPTY14
85-
#defineREG_ASSERT15
86-
#defineREG_INVARG16
87-
#defineREG_ATOI255/* convert name to number (!) */
88-
#defineREG_ITOA0400/* convert number to name (!) */
71+
#defineREG_NOMATCH 1
72+
#defineREG_BADPAT 2
73+
#defineREG_ECOLLATE 3
74+
#defineREG_ECTYPE 4
75+
#defineREG_EESCAPE 5
76+
#defineREG_ESUBREG 6
77+
#defineREG_EBRACK 7
78+
#defineREG_EPAREN 8
79+
#defineREG_EBRACE 9
80+
#defineREG_BADBR10
81+
#defineREG_ERANGE11
82+
#defineREG_ESPACE12
83+
#defineREG_BADRPT13
84+
#defineREG_EMPTY14
85+
#defineREG_ASSERT15
86+
#defineREG_INVARG16
87+
#defineREG_ATOI255/* convert name to number (!) */
88+
#defineREG_ITOA0400/* convert number to name (!) */
8989

9090
/* regexec() flags */
91-
#defineREG_NOTBOL00001
92-
#defineREG_NOTEOL00002
93-
#defineREG_STARTEND00004
94-
#defineREG_TRACE00400/* tracing of execution */
95-
#defineREG_LARGE01000/* force large representation */
96-
#defineREG_BACKR02000/* force use of backref code */
91+
#defineREG_NOTBOL00001
92+
#defineREG_NOTEOL00002
93+
#defineREG_STARTEND00004
94+
#defineREG_TRACE00400/* tracing of execution */
95+
#defineREG_LARGE01000/* force large representation */
96+
#defineREG_BACKR02000/* force use of backref code */
9797

98-
__BEGIN_DECLS
99-
intpg95_regcomp__P((regex_t*,constchar*,int));
100-
size_tpg95_regerror__P((int,constregex_t*,char*,size_t));
101-
intpg95_regexec__P((constregex_t*,
102-
constchar*,size_t,regmatch_t [],int));
103-
voidpg95_regfree__P((regex_t*));
104-
__END_DECLS
98+
intpg95_regcomp(regex_t*,constchar*,int);
99+
size_tpg95_regerror(int,constregex_t*,char*,size_t);
100+
intpg95_regexec (constregex_t*,
101+
constchar*,size_t,regmatch_t [],int);
102+
voidpg95_regfree (regex_t*);
105103

106104
#endif/* !_REGEX_H_ */

‎src/interfaces/libpq/fe-exec.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/interfaces/libpq/fe-exec.c,v 1.20 1996/12/13 09:25:08 bryanh Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.21 1996/12/15 09:05:53 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -21,7 +21,7 @@
2121
#include"libpq-fe.h"
2222
#include<signal.h>
2323
#include<sys/ioctl.h>
24-
#include<sys/termios.h>
24+
#includeTERMIOS_H_LOCATION
2525

2626
#ifdefTIOCGWINSZ
2727
structwinsizescreen_size;

0 commit comments

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