database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

Make compile on AIX, Alpha OSF. Thanks Darren King, Igor Notanzon.

Browse Source
This commit is contained in:
Bryan Henderson 1996-12-15 09:05:53 +00:00
parent 290d3b5198
commit 9fc7250d3a
6 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/access/nbtree/nbtsearch.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.11 1996/12/06 09:41:45 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.12 1996/12/15 09:05:10 bryanh Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,11 +27,19 @@
#endif #endif
static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, BTStack stack_in); static BTStack
static OffsetNumber _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, Size keysz, ScanKey scankey, OffsetNumber offnum); _bt_searchr(Relation rel, int keysz, ScanKey scankey,
int _bt_compare(Relation rel, TupleDesc itupdesc, Page page, int keysz, ScanKey scankey, OffsetNumber offnum); Buffer *bufP, BTStack stack_in);
static bool _bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); static OffsetNumber
static RetrieveIndexResult _bt_endpoint(IndexScanDesc scan, ScanDirection dir); _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page,
Size keysz, ScanKey scankey, OffsetNumber offnum);
int
_bt_compare(Relation rel, TupleDesc itupdesc, Page page,
int keysz, ScanKey scankey, OffsetNumber offnum);
static bool
_bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
static RetrieveIndexResult
_bt_endpoint(IndexScanDesc scan, ScanDirection dir);
/* /*
* _bt_search() -- Search for a scan key in the index. * _bt_search() -- Search for a scan key in the index.
@ -472,7 +480,7 @@ _bt_compare(Relation rel,
elog(WARN, "_bt_compare: invalid comparison to high key"); elog(WARN, "_bt_compare: invalid comparison to high key");
} }
#ifdef 0 #if 0
/* /*
* We just have to belive that right answer will not * We just have to belive that right answer will not
* break anything. I've checked code and all seems to be ok. * break anything. I've checked code and all seems to be ok.
@ -1130,7 +1138,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
* Scanning in BackwardScanDirection is not understandable at all. * Scanning in BackwardScanDirection is not understandable at all.
* Well - new stuff. - vadim 12/06/96 * Well - new stuff. - vadim 12/06/96
*/ */
#ifdef 0 #if 0
if (PageIsEmpty(page) || start > maxoff) { if (PageIsEmpty(page) || start > maxoff) {
ItemPointerSet(current, blkno, maxoff); ItemPointerSet(current, blkno, maxoff);
if (!_bt_step(scan, &buf, BackwardScanDirection)) if (!_bt_step(scan, &buf, BackwardScanDirection))
@ -1166,7 +1174,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
* empty why do scanning in ForwardScanDirection ??? * empty why do scanning in ForwardScanDirection ???
* Well - new stuff. - vadim 12/06/96 * Well - new stuff. - vadim 12/06/96
*/ */
#ifdef 0 #if 0
if (PageIsEmpty(page)) { if (PageIsEmpty(page)) {
ItemPointerSet(current, blkno, FirstOffsetNumber); ItemPointerSet(current, blkno, FirstOffsetNumber);
if (!_bt_step(scan, &buf, ForwardScanDirection)) if (!_bt_step(scan, &buf, ForwardScanDirection))

3
src/backend/utils/adt/nabstime.c
View File

@ -7,13 +7,14 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.7 1996/11/08 05:59:45 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.8 1996/12/15 09:05:35 bryanh Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <sys/timeb.h>
#include <sys/types.h> #include <sys/types.h>
#include "postgres.h" #include "postgres.h"
#include "access/xact.h" #include "access/xact.h"

7
src/include/config.h
View File

@ -15,6 +15,12 @@
#endif #endif
#endif /* !defined(sparc_solaris) */ #endif /* !defined(sparc_solaris) */
#if defined(aix)
#define TERMIOS_H_LOCATION <termios.h>
#else
#define TERMIOS_H_LOCATION <sys/termios.h>
#endif
#define HAVE_MEMMOVE #define HAVE_MEMMOVE
#if defined(aix) #if defined(aix)
@ -39,6 +45,7 @@
# define NEED_UNION_SEMUN # define NEED_UNION_SEMUN
# define SB_PAD 40 # define SB_PAD 40
# define HAS_TEST_AND_SET # define HAS_TEST_AND_SET
include <sys/mman.h> /* for msemaphore */
typedef msemaphore slock_t; typedef msemaphore slock_t;
#endif #endif

14
src/include/regex/regex.h
View File

@ -48,7 +48,7 @@ typedef off_t regoff_t;
typedef struct { typedef struct {
int re_magic; int re_magic;
size_t re_nsub; /* number of parenthesized subexpressions */ size_t re_nsub; /* number of parenthesized subexpressions */
__const char *re_endp; /* end pointer for REG_PEND */ const char *re_endp; /* end pointer for REG_PEND */
struct re_guts *re_g; /* none of your business :-) */ struct re_guts *re_g; /* none of your business :-) */
} regex_t; } regex_t;
@ -95,12 +95,10 @@ typedef struct {
#define REG_LARGE 01000 /* force large representation */ #define REG_LARGE 01000 /* force large representation */
#define REG_BACKR 02000 /* force use of backref code */ #define REG_BACKR 02000 /* force use of backref code */
__BEGIN_DECLS int pg95_regcomp(regex_t *, const char *, int);
int pg95_regcomp __P((regex_t *, const char *, int)); size_t pg95_regerror(int, const regex_t *, char *, size_t);
size_t pg95_regerror __P((int, const regex_t *, char *, size_t)); int pg95_regexec (const regex_t *,
int pg95_regexec __P((const regex_t *, const char *, size_t, regmatch_t [], int);
const char *, size_t, regmatch_t [], int)); void pg95_regfree (regex_t *);
void pg95_regfree __P((regex_t *));
__END_DECLS
#endif /* !_REGEX_H_ */ #endif /* !_REGEX_H_ */

4
src/interfaces/libpq/fe-exec.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.20 1996/12/13 09:25:08 bryanh Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.21 1996/12/15 09:05:53 bryanh Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -21,7 +21,7 @@
#include "libpq-fe.h" #include "libpq-fe.h"
#include <signal.h> #include <signal.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/termios.h> #include TERMIOS_H_LOCATION
#ifdef TIOCGWINSZ #ifdef TIOCGWINSZ
struct winsize screen_size; struct winsize screen_size;