From 7176e60bc8cee15e5ff7a76545630ff332d8fabc Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 15 Jul 2007 22:49:36 +0000
Subject: [PATCH] Silence Solaris compiler warnings, per buildfarm.
---
contrib/tsearch2/query_cleanup.c | 3 +++
contrib/tsearch2/query_support.c | 9 +++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/contrib/tsearch2/query_cleanup.c b/contrib/tsearch2/query_cleanup.c
index 08d3ff219b5..0d3427ff9b8 100644
--- a/contrib/tsearch2/query_cleanup.c
+++ b/contrib/tsearch2/query_cleanup.c
@@ -173,6 +173,9 @@ clean_NOT_v2(ITEM * ptr, int4 *len)
#ifdef V_UNKNOWN /* exists in Windows headers */
#undef V_UNKNOWN
#endif
+#ifdef V_FALSE /* exists in Solaris headers */
+#undef V_FALSE
+#endif
#define V_UNKNOWN 0
#define V_TRUE 1
diff --git a/contrib/tsearch2/query_support.c b/contrib/tsearch2/query_support.c
index 0fc6fe334d2..57332cba1e8 100644
--- a/contrib/tsearch2/query_support.c
+++ b/contrib/tsearch2/query_support.c
@@ -180,9 +180,8 @@ tsquery_cmp(PG_FUNCTION_ARGS)
PG_RETURN_INT32(res);
}
-#define CMPFUNC( NAME, ACTION ) \
-PG_FUNCTION_INFO_V1(NAME); \
-Datum NAME(PG_FUNCTION_ARGS); \
+#define CMPFUNC( NAME, ACTION ) \
+Datum NAME(PG_FUNCTION_ARGS); \
\
Datum \
NAME(PG_FUNCTION_ARGS) { \
@@ -194,7 +193,9 @@ NAME(PG_FUNCTION_ARGS) { \
PG_FREE_IF_COPY(b,1); \
\
PG_RETURN_BOOL( ACTION ); \
-}
+} \
+ \
+PG_FUNCTION_INFO_V1(NAME)
CMPFUNC(tsquery_lt, res < 0);
CMPFUNC(tsquery_le, res <= 0);
--
GitLab