summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-06-14 01:34:07 +0000
committerBruce Momjian1998-06-14 01:34:07 +0000
commitb52c666a99f51d8d8b5d154600787badfad3f718 (patch)
treed97aa2d27977474a1fbda2c9aa6ade474652af76
parentbedfe275cc687954f7bcc867d3946b0832594278 (diff)
Make new DISABLE_COMPLEX_MACRO for compilers that can't handle our
macros.
-rw-r--r--src/include/access/heapam.h6
-rw-r--r--src/include/port/univel.h3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 8e322b1d915..56aa0e66eb0 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: heapam.h,v 1.31 1998/03/01 04:46:56 scrappy Exp $
+ * $Id: heapam.h,v 1.32 1998/06/14 01:34:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -88,7 +88,7 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;
*
* ----------------
*/
-#if !defined(USE_UNIVEL_CC)
+#if !defined(DISABLE_COMPLEX_MACRO)
#define fastgetattr(tup, attnum, tupleDesc, isnull) \
( \
@@ -132,7 +132,7 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;
) \
)
-#else /* !defined(USE_UNIVEL_CC) */
+#else /* !defined(DISABLE_COMPLEX_MACRO) */
extern Datum nocachegetattr(HeapTuple tup, int attnum,
TupleDesc att, bool *isnull);
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index cd52bd76877..ae706eda5e0 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -10,8 +10,11 @@
* the native UNIXWARE C compiler.
***************************************/
#define USE_UNIVEL_CC
+
typedef unsigned char slock_t;
+#define DISABLE_COMPLEX_MACRO
+
/***************************************************************
* strcasecmp() is in c89.a. The following include will get the
* needed prototype.