diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 7236ce92a77c86a42aeea103e88a7aac3247e54d..4621d8367139b838b9583b1d06aed105a1587ab9 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.19 1997/09/14 03:59:44 momjian Exp $
+ * $Id: heapam.h,v 1.20 1997/10/30 23:37:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -101,10 +101,10 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;
 #define heap_getattr(tup, b, attnum, tupleDesc, isnull) \
 	(AssertMacro((tup) != NULL) ? \
 		((attnum) > (int) (tup)->t_natts) ? \
-			(((isnull) ? (*(isnull) = true) : (char)NULL), (Datum)NULL) : \
+			(((isnull) ? (*(isnull) = true) : (void)NULL), (Datum)NULL) : \
 		((attnum) > 0) ? \
 			fastgetattr((tup), (attnum), (tupleDesc), (isnull)) : \
-		(((isnull) ? (*(isnull) = false) : (char)NULL), heap_getsysattr((tup), (b), (attnum))) : \
+		(((isnull) ? (*(isnull) = false) : (void)NULL), heap_getsysattr((tup), (b), (attnum))) : \
 	(Datum)NULL)
 
 extern HeapAccessStatistics heap_access_stats;	/* in stats.c */
diff --git a/src/include/c.h b/src/include/c.h
index 5caa424b0af4d76ab3687b6f7ed1b83abdf0b3e4..2aeb743f9a0706ae68c5da553f7344678c4a96cb 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.25 1997/10/27 12:07:10 vadim Exp $
+ * $Id: c.h,v 1.26 1997/10/30 23:36:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -691,7 +691,7 @@ typedef struct Exception
  */
 /* we do this so if the macro is used in an if action, it will work */
 #define StrNCpy(dst,src,len)	\
-	(strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' : NULL,(void)(dst))
+	(strncpy((dst),(src),(len)),(len > 0) ? *((dst)+(len)-1)='\0' : (void)NULL,(void)(dst))
 
 /* Get a bit mask of the bits set in non-int32 aligned addresses */
 #define INT_ALIGN_MASK (sizeof(int32) - 1)