summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/include/access/genam.h10
-rw-r--r--src/include/access/heapam.h6
-rw-r--r--src/include/access/ibit.h4
-rw-r--r--src/include/access/iqual.h6
-rw-r--r--src/include/access/printtup.h4
-rw-r--r--src/include/access/rtscan.h8
-rw-r--r--src/include/access/skey.h6
-rw-r--r--src/include/access/strat.h4
-rw-r--r--src/include/access/transam.h4
-rw-r--r--src/include/access/tupdesc.h8
-rw-r--r--src/include/access/tupmacs.h4
-rw-r--r--src/include/access/xact.h6
-rw-r--r--src/include/bootstrap/bootstrap.h8
-rw-r--r--src/include/c.h20
14 files changed, 51 insertions, 47 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index b2e55df620e..db6910620b2 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,17 +6,17 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: genam.h,v 1.18 1999/02/13 23:20:50 momjian Exp $
+ * $Id: genam.h,v 1.18.2.1 1999/07/30 18:26:58 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef GENAM_H
#define GENAM_H
-#include <access/sdir.h>
-#include <access/funcindex.h>
-#include <access/relscan.h>
-#include <access/itup.h>
+#include "access/funcindex.h"
+#include "access/itup.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
/* ----------------
* generalized index_ interface routines
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 17f5f2aede6..6a930747bfe 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,20 +6,20 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: heapam.h,v 1.43 1999/07/10 22:06:26 tgl Exp $
+ * $Id: heapam.h,v 1.43.2.1 1999/07/30 18:26:58 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef HEAPAM_H
#define HEAPAM_H
-#include "access/tupmacs.h"
+#include <time.h>
#include "access/htup.h"
#include "access/relscan.h"
+#include "access/tupmacs.h"
#include "storage/block.h"
#include "utils/rel.h"
#include "utils/tqual.h"
-#include <time.h>
/* ----------------------------------------------------------------
* heap access method statistics
diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index acbe22b6a1d..f2a89fcafc1 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -6,14 +6,14 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: ibit.h,v 1.9 1999/02/13 23:20:54 momjian Exp $
+ * $Id: ibit.h,v 1.9.2.1 1999/07/30 18:26:59 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef IBIT_H
#define IBIT_H
-#include <utils/memutils.h>
+#include "utils/memutils.h"
typedef struct IndexAttributeBitMapData
{
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index be765ab4ec7..59d62a0b2d0 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -6,15 +6,15 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: iqual.h,v 1.11 1999/02/13 23:20:55 momjian Exp $
+ * $Id: iqual.h,v 1.11.2.1 1999/07/30 18:26:59 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef IQUAL_H
#define IQUAL_H
-#include <access/skey.h>
-#include <access/itup.h>
+#include "access/itup.h"
+#include "access/skey.h"
/* ----------------
diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h
index 0fce96e73a2..178bcc2bbe2 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -6,14 +6,14 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: printtup.h,v 1.10 1999/05/25 22:42:32 momjian Exp $
+ * $Id: printtup.h,v 1.10.2.1 1999/07/30 18:26:59 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef PRINTTUP_H
#define PRINTTUP_H
-#include <tcop/dest.h>
+#include "tcop/dest.h"
extern DestReceiver *printtup_create_DR(void);
extern void showatts(char *name, TupleDesc attinfo);
diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h
index 88932322d33..c393c66e885 100644
--- a/src/include/access/rtscan.h
+++ b/src/include/access/rtscan.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rtscan.h,v 1.6 1999/02/13 23:20:58 momjian Exp $
+ * $Id: rtscan.h,v 1.6.2.1 1999/07/30 18:26:59 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef RTSCAN_H
#define RTSCAN_H
-#include <utils/rel.h>
-#include <storage/block.h>
-#include <storage/off.h>
+#include "storage/block.h"
+#include "storage/off.h"
+#include "utils/rel.h"
void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
diff --git a/src/include/access/skey.h b/src/include/access/skey.h
index 57cc7e0d444..732f4111dc3 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: skey.h,v 1.11 1999/02/13 23:20:58 momjian Exp $
+ * $Id: skey.h,v 1.11.2.1 1999/07/30 18:26:59 scrappy Exp $
*
*
* Note:
@@ -16,8 +16,8 @@
#ifndef SKEY_H
#define SKEY_H
-#include <access/attnum.h>
-#include <fmgr.h>
+#include "access/attnum.h"
+#include "fmgr.h"
typedef struct ScanKeyData
{
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index b1e58f08dbe..a12ab537fa6 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -7,14 +7,14 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: strat.h,v 1.15 1999/05/25 22:42:34 momjian Exp $
+ * $Id: strat.h,v 1.15.2.1 1999/07/30 18:26:59 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef STRAT_H
#define STRAT_H
-#include <access/skey.h>
+#include "access/skey.h"
typedef uint16 StrategyNumber;
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 2551278f129..49083cb01b3 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: transam.h,v 1.22 1999/06/10 14:17:12 vadim Exp $
+ * $Id: transam.h,v 1.22.2.1 1999/07/30 18:26:59 scrappy Exp $
*
* NOTES
* Transaction System Version 101 now support proper oid
@@ -17,7 +17,7 @@
#ifndef TRANSAM_H
#define TRANSAM_H
-#include <storage/bufmgr.h>
+#include "storage/bufmgr.h"
/* ----------------
* transaction system version id
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index f338723d5f1..96ae74bcf6d 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tupdesc.h,v 1.22 1999/05/25 22:42:36 momjian Exp $
+ * $Id: tupdesc.h,v 1.22.2.1 1999/07/30 18:27:00 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef TUPDESC_H
#define TUPDESC_H
-#include <nodes/pg_list.h>
-#include <access/attnum.h>
-#include <catalog/pg_attribute.h>
+#include "access/attnum.h"
+#include "catalog/pg_attribute.h"
+#include "nodes/pg_list.h"
typedef struct attrDefault
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 3f2d6e8d962..7b4b9b99e67 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -6,13 +6,15 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tupmacs.h,v 1.10 1999/05/25 16:13:36 momjian Exp $
+ * $Id: tupmacs.h,v 1.10.2.1 1999/07/30 18:27:00 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef TUPMACS_H
#define TUPMACS_H
+#include "utils/memutils.h"
+
/*
* check to see if the ATT'th bit of an array of 8-bit bytes is set.
*/
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index a855806c193..ac0e3b18dbe 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,15 +6,15 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: xact.h,v 1.20 1999/02/13 23:21:00 momjian Exp $
+ * $Id: xact.h,v 1.20.2.1 1999/07/30 18:27:00 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef XACT_H
#define XACT_H
-#include <access/transam.h>
-#include <utils/nabstime.h>
+#include "access/transam.h"
+#include "utils/nabstime.h"
/* ----------------
* transaction state structure
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index 2e4cb77969b..18e61fd1ea0 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bootstrap.h,v 1.14 1999/02/13 23:21:00 momjian Exp $
+ * $Id: bootstrap.h,v 1.14.2.1 1999/07/30 18:27:02 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef BOOTSTRAP_H
#define BOOTSTRAP_H
-#include <access/funcindex.h>
-#include <access/itup.h>
-#include <utils/rel.h>
+#include "access/funcindex.h"
+#include "access/itup.h"
+#include "utils/rel.h"
#define MAXATTR 40 /* max. number of attributes in a relation */
diff --git a/src/include/c.h b/src/include/c.h
index bd14eaa5310..6eacebdf67d 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: c.h,v 1.58 1999/07/01 19:47:25 momjian Exp $
+ * $Id: c.h,v 1.58.2.1 1999/07/30 18:26:57 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,13 @@
on some platforms, and we only want our definitions used if stdlib.h doesn't
have its own. The same goes for stddef and stdarg if present.
*/
+
+#include "config.h"
+
+
+#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#ifdef STDC_HEADERS
#include <stddef.h>
#include <stdarg.h>
@@ -104,12 +110,6 @@ typedef bool *BoolPtr;
*/
/*
- * We used to define const, signed, volatile, and inline as empty
- * if __STDC__ wasn't defined. Now we let configure test whether
- * those keywords work; config.h defines them as empty if not.
- */
-
-/*
* CppAsString
* Convert the argument to a string, using the C preprocessor.
* CppConcat
@@ -759,7 +759,7 @@ extern char *vararg_format(const char *fmt,...);
#endif /* hpux */
#endif
-#if defined(sun) && defined(sparc) && !defined(__SVR4)
+#if defined(sun) && defined(__sparc__) && !defined(__SVR4)
#define memmove(d, s, l) bcopy(s, d, l)
#include <unistd.h>
#include <varargs.h>
@@ -791,12 +791,14 @@ extern char *vararg_format(const char *fmt,...);
#ifndef HAVE_SNPRINTF
extern int snprintf(char *str, size_t count, const char *fmt,...);
-
#endif
#ifndef HAVE_VSNPRINTF
extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args);
+#endif
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
#endif
/* ----------------