From 0e699286d3398a1ee9947bbe4567a2cdb6bb81d8 Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Wed, 24 Sep 1997 17:45:21 +0000
Subject: [PATCH] Coerce type of NULL pointer return to suppress gcc compiler
warnings.
---
src/backend/access/common/heaptuple.c | 6 +++---
src/backend/executor/spi.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 78f92190a2f..f124e564673 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.26 1997/09/18 20:19:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.27 1997/09/24 17:44:24 thomas Exp $
*
* NOTES
* The old interface functions have been converted to macros
@@ -424,7 +424,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
default:
elog(WARN, "heap_getsysattr: undefined attnum %d", attnum);
}
- return (NULL);
+ return ((Datum) NULL);
}
/* ----------------
@@ -517,7 +517,7 @@ fastgetattr(HeapTuple tup,
{
if (isnull)
*isnull = true;
- return NULL;
+ return (Datum) NULL;
}
/* ----------------
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 12a511be27e..6a3d1485158 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -437,7 +437,7 @@ SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull)
*isnull = true;
SPI_result = 0;
if (tuple->t_natts < fnumber || fnumber <= 0)
- return (NULL);
+ return ((Datum) NULL);
val = heap_getattr(tuple, InvalidBuffer, fnumber, tupdesc, isnull);
--
GitLab