diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 8e322b1d91..56aa0e66eb 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 cd52bd7687..ae706eda5e 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.