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

Commit56b3182

Browse files
committed
From: "Billy G. Allie" <Bill.Allie@mug.org>
The following patches will allow postgreSQL 6.3 to compile and run on aUNIXWARE 2.1.2 system with the native C compiler with the following librarychange: The alloca function must be copied from the libucb.a archive and added to the libgen.a archive.Also, the GNU flex program is needed to successfully build postgreSQL.
1 parent5b3e78a commit56b3182

File tree

6 files changed

+88
-34
lines changed

6 files changed

+88
-34
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/* Dummy file used for nothing at this point
22
*
33
* see univel.h
4-
*/
4+
*/
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
/*-------------------------------------------------------------------------
22
*
3-
*port-protos.h--
3+
*univel.h--
44
* port-specific prototypes for Intel x86/UNIXWARE
55
*
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
*port-protos.h,v 1.2 1995/03/17 06:40:18 andrew Exp
9+
*univel.h,v 1.2 1995/03/17 06:40:18 andrew Exp
1010
*
1111
*-------------------------------------------------------------------------
12-
*/
13-
#ifndefPORT_PROTOS_H
14-
#definePORT_PROTOS_H
15-
16-
#include<dlfcn.h>
17-
#include"fmgr.h"/* for func_ptr */
18-
#include"utils/dynamic_loader.h"
19-
20-
/* dynloader.c */
12+
*/
13+
#ifndefPORT_PROTOS_H
14+
#definePORT_PROTOS_H
15+
16+
#include<dlfcn.h>
17+
#include"fmgr.h"/* for func_ptr */
18+
#include"utils/dynamic_loader.h"
19+
20+
/* dynloader.c */
2121
/*
2222
* Dynamic Loader on Intel x86/Intel SVR4.
2323
*
2424
* this dynamic loader uses the system dynamic loading interface for shared
2525
* libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
2626
* library as the file to be dynamically loaded.
2727
*
28-
*/
29-
#definepg_dlopen(f)dlopen(f,RTLD_LAZY)
30-
#definepg_dlsymdlsym
31-
#definepg_dlclosedlclose
32-
#definepg_dlerrordlerror
33-
34-
#endif/* PORT_PROTOS_H */
28+
*/
29+
#definepg_dlopen(f)dlopen(f,RTLD_LAZY)
30+
#definepg_dlsymdlsym
31+
#definepg_dlclosedlclose
32+
#definepg_dlerrordlerror
33+
34+
#endif/* PORT_PROTOS_H */

‎src/include/access/heapam.h‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: heapam.h,v 1.30 1998/02/26 04:40:05 momjian Exp $
9+
* $Id: heapam.h,v 1.31 1998/03/01 04:46:56 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -88,6 +88,8 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;
8888
*
8989
* ----------------
9090
*/
91+
#if !defined(USE_UNIVEL_CC)
92+
9193
#definefastgetattr(tup,attnum,tupleDesc,isnull) \
9294
( \
9395
AssertMacro((attnum) > 0) ? \
@@ -130,7 +132,57 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;
130132
) \
131133
)
132134

135+
#else/* !defined(USE_UNIVEL_CC) */
136+
137+
externDatumnocachegetattr(HeapTupletup,intattnum,
138+
TupleDescatt,bool*isnull);
139+
140+
staticDatumfastgetattr(HeapTupletup,intattnum,TupleDesctupleDesc,
141+
bool*isnull)
142+
{
143+
return (
144+
(attnum)>0 ?
145+
(
146+
((isnull) ? (*(isnull)= false) : (dummyret)NULL),
147+
HeapTupleNoNulls(tup) ?
148+
(
149+
((tupleDesc)->attrs[(attnum)-1]->attcacheoff!=-1||
150+
(attnum)==1) ?
151+
(
152+
(Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]),
153+
(char*) (tup)+ (tup)->t_hoff+
154+
(
155+
((attnum)!=1) ?
156+
(tupleDesc)->attrs[(attnum)-1]->attcacheoff
157+
:
158+
0
159+
)
160+
)
161+
)
162+
:
163+
nocachegetattr((tup), (attnum), (tupleDesc), (isnull))
164+
)
165+
:
166+
(
167+
att_isnull((attnum)-1, (tup)->t_bits) ?
168+
(
169+
((isnull) ? (*(isnull)= true) : (dummyret)NULL),
170+
(Datum)NULL
171+
)
172+
:
173+
(
174+
nocachegetattr((tup), (attnum), (tupleDesc), (isnull))
175+
)
176+
)
177+
)
178+
:
179+
(
180+
(Datum)NULL
181+
)
182+
);
183+
}
133184

185+
#endif
134186

135187
/* ----------------
136188
*heap_getattr

‎src/include/port/univel.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
* Define this if you are compiling with
1010
* the native UNIXWARE C compiler.
1111
***************************************/
12-
#defineUSE_UNIVEL_CC_ASM
12+
#defineUSE_UNIVEL_CC
1313
typedefunsignedcharslock_t;
1414

1515
/***************************************************************
16-
* strcasecmp() is in c89, but is not in any include file :-(
16+
* strcasecmp() is in c89.a. The following include will get the
17+
* needed prototype.
1718
***************************************************************/
18-
intstrcasecmp(char*,char*);
19+
#include<strings.h>
1920

2021
#ifndefBIG_ENDIAN
2122
#defineBIG_ENDIAN4321

‎src/include/storage/s_lock.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.27 1998/02/26 04:43:32 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.28 1998/03/01 04:47:24 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -305,21 +305,21 @@ tas_dummy()
305305

306306
#if defined(NEED_I386_TAS_ASM)
307307

308-
#if defined(USE_UNIVEL_CC_ASM)
308+
#if defined(USE_UNIVEL_CC)
309309
asmvoid
310310
S_LOCK(char*lval)
311311
{
312-
%labagain;
312+
%labagain;
313313
/* Upon entry, %eax will contain the pointer to the lock byte */
314-
pushl %ebx
315-
xchgl %eax, %ebx
316-
movb$-1, %al
314+
pushl %ebx
315+
xchgl %eax, %ebx
316+
movb$255, %al
317317
again:
318318
lock
319-
xchgb %al, (%ebx)
320-
cmpb$0, %al
321-
jneagain
322-
popl %ebx
319+
xchgb %al, (%ebx)
320+
cmpb$0, %al
321+
jneagain
322+
popl %ebx
323323
}
324324

325325
#else

‎src/template/univel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ SRCH_INC:
55
SRCH_LIB:
66
USE_LOCALE:no
77
DLSUFFIX:.so
8-
YACC=/usr/ccs/bin/yacc
98
YACC:yacc
9+
YFLAGS:-d
1010
CC:cc
11+
LIBS:-lc89

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp