Another series started from utils/builtins.h

This commit is contained in:
Marc G. Fournier 1996-11-04 07:46:06 +00:00
parent d93d3c843a
commit 5a5f9420e5
8 changed files with 25 additions and 34 deletions

View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: skey.h,v 1.2 1996/10/19 04:36:08 scrappy Exp $ * $Id: skey.h,v 1.3 1996/11/04 07:45:26 scrappy Exp $
* *
* *
* Note: * Note:
@ -16,8 +16,7 @@
#ifndef SKEY_H #ifndef SKEY_H
#define SKEY_H #define SKEY_H
#include "access/attnum.h" #include <access/attnum.h>
typedef struct ScanKeyData { typedef struct ScanKeyData {
bits16 sk_flags; /* flags */ bits16 sk_flags; /* flags */

View File

@ -7,14 +7,14 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: strat.h,v 1.3 1996/11/01 09:30:41 scrappy Exp $ * $Id: strat.h,v 1.4 1996/11/04 07:45:27 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#ifndef STRAT_H #ifndef STRAT_H
#define STRAT_H #define STRAT_H
#include "access/skey.h" #include <access/skey.h>
typedef uint16 StrategyNumber; typedef uint16 StrategyNumber;

View File

@ -6,16 +6,16 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: tupdesc.h,v 1.4 1996/11/01 09:22:33 scrappy Exp $ * $Id: tupdesc.h,v 1.5 1996/11/04 07:45:28 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#ifndef TUPDESC_H #ifndef TUPDESC_H
#define TUPDESC_H #define TUPDESC_H
#include "nodes/pg_list.h" #include <nodes/pg_list.h>
#include "catalog/pg_attribute.h" #include <access/attnum.h>
#include "access/attnum.h" #include <catalog/pg_attribute.h>
typedef struct tupleDesc { typedef struct tupleDesc {
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------

View File

@ -5,15 +5,15 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: prs2lock.h,v 1.3 1996/11/01 09:30:54 scrappy Exp $ * $Id: prs2lock.h,v 1.4 1996/11/04 07:45:46 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#ifndef PRS2LOCK_H #ifndef PRS2LOCK_H
#define PRS2LOCK_H #define PRS2LOCK_H
#include "access/attnum.h" #include <access/attnum.h>
#include "nodes/pg_list.h" #include <nodes/pg_list.h>
/* /*
* RewriteRule - * RewriteRule -

View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: fd.h,v 1.3 1996/11/01 09:31:10 scrappy Exp $ * $Id: fd.h,v 1.4 1996/11/04 07:45:53 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -37,19 +37,15 @@
/* /*
* FileOpen uses the standard UNIX open(2) flags. * FileOpen uses the standard UNIX open(2) flags.
*/ */
#include <fcntl.h> /* for O_ on most */
#ifndef O_RDONLY #ifndef O_RDONLY
#include <sys/file.h> /* for O_ on the rest */
#endif /* O_RDONLY */ #endif /* O_RDONLY */
/* /*
* FileSeek uses the standard UNIX lseek(2) flags. * FileSeek uses the standard UNIX lseek(2) flags.
*/ */
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> /* for SEEK_ on most */
#else #else
#ifndef SEEK_SET #ifndef SEEK_SET
#include <stdio.h> /* for SEEK_ on the rest */
#endif /* SEEK_SET */ #endif /* SEEK_SET */
#endif /* WIN32 */ #endif /* WIN32 */

View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: builtins.h,v 1.4 1996/11/04 04:00:43 momjian Exp $ * $Id: builtins.h,v 1.5 1996/11/04 07:46:00 scrappy Exp $
* *
* NOTES * NOTES
* This should normally only be included by fmgr.h. * This should normally only be included by fmgr.h.
@ -18,10 +18,10 @@
#ifndef BUILTINS_H #ifndef BUILTINS_H
#define BUILTINS_H #define BUILTINS_H
#include "storage/itemptr.h" #include <storage/itemptr.h>
#include "utils/nabstime.h" #include <utils/rel.h>
#include "utils/geo-decls.h" #include <utils/nabstime.h>
#include "utils/rel.h" #include <utils/geo-decls.h>
/* /*
* Defined in adt/ * Defined in adt/
@ -228,7 +228,6 @@ extern POLYGON *rt_poly_inter();
extern int32 pqtest(struct varlena *vlena); extern int32 pqtest(struct varlena *vlena);
/* arrayfuncs.c */ /* arrayfuncs.c */
#include "utils/array.h"
/* date.c */ /* date.c */
extern int32 reltimein(char *timestring); extern int32 reltimein(char *timestring);
@ -335,7 +334,6 @@ extern long float84gt(float64 arg1, float32 arg2);
extern long float84ge(float64 arg1, float32 arg2); extern long float84ge(float64 arg1, float32 arg2);
/* geo-ops.c, geo-selfuncs.c */ /* geo-ops.c, geo-selfuncs.c */
#include "utils/geo-decls.h"
/* misc.c */ /* misc.c */
extern bool NullValue(Datum value, bool *isNull); extern bool NullValue(Datum value, bool *isNull);
@ -425,6 +423,5 @@ extern struct varlena *byteaSetByte(struct varlena *v, int32 n, int32 newByte);
extern struct varlena *byteaSetBit(struct varlena *v, int32 n, int32 newBit); extern struct varlena *byteaSetBit(struct varlena *v, int32 n, int32 newBit);
/* acl.c */ /* acl.c */
#include "utils/acl.h"
#endif /* BUILTINS_H */ #endif /* BUILTINS_H */

View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: geo-decls.h,v 1.2 1996/10/31 09:51:18 scrappy Exp $ * $Id: geo-decls.h,v 1.3 1996/11/04 07:46:04 scrappy Exp $
* *
* NOTE * NOTE
* These routines do *not* use the float types from adt/. * These routines do *not* use the float types from adt/.
@ -24,7 +24,6 @@
* Useful floating point utilities and constants. * Useful floating point utilities and constants.
*-------------------------------------------------------------------*/ *-------------------------------------------------------------------*/
#include <math.h>
#define EPSILON 1.0E-06 #define EPSILON 1.0E-06

View File

@ -6,19 +6,19 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: rel.h,v 1.5 1996/11/01 09:31:17 scrappy Exp $ * $Id: rel.h,v 1.6 1996/11/04 07:46:06 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#ifndef REL_H #ifndef REL_H
#define REL_H #define REL_H
#include "access/strat.h" #include <access/strat.h>
#include "rewrite/prs2lock.h" #include <rewrite/prs2lock.h>
#include "access/tupdesc.h" #include <access/tupdesc.h>
#include "catalog/pg_class.h" #include <catalog/pg_class.h>
#include "catalog/pg_am.h" #include <catalog/pg_am.h>
#include "storage/fd.h" #include <storage/fd.h>
typedef struct RelationData { typedef struct RelationData {
File rd_fd; /* open file descriptor */ File rd_fd; /* open file descriptor */