It appears that Darwin (OS X) does not cope well with C functions that

have the same name as the containing shared library --- as best I can
tell, the compiler internally creates a function of that name, and does
not warn you about the conflict.  Fix buildfarm failure in back branches
by renaming tsearch() trigger function at the C level.

diff --git a/contrib/tsearch/tsearch.sql.in b/contrib/tsearch/tsearch.sql.in
index b247e2327614c9fb034acdb8be2d35b31c384dfc..dda95ba2e7de2ecb5d347beaf98980564e2fb874 100644 (file)
--- a/contrib/tsearch/tsearch.sql.in
+++ b/contrib/tsearch/tsearch.sql.in
@@ -145,7 +145,7 @@ CREATE OPERATOR ~# (
 --Trigger
 CREATE FUNCTION tsearch()
 RETURNS trigger
-AS 'MODULE_PATHNAME'
+AS 'MODULE_PATHNAME', 'tsearch_trigger'
 LANGUAGE 'C';
 
 --GiST

diff --git a/contrib/tsearch/txtidx.c b/contrib/tsearch/txtidx.c
index deab0bcd1de97614786af9ef7f9072d9713afa29..61b29d19cf78badf84399d445285bd7a7acb8a94 100644 (file)
--- a/contrib/tsearch/txtidx.c
+++ b/contrib/tsearch/txtidx.c
@@ -33,8 +33,8 @@ Datum         txtidx_out(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(txt2txtidx);
 Datum          txt2txtidx(PG_FUNCTION_ARGS);
 
-PG_FUNCTION_INFO_V1(tsearch);
-Datum          tsearch(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(tsearch_trigger);
+Datum          tsearch_trigger(PG_FUNCTION_ARGS);
 
 PG_FUNCTION_INFO_V1(txtidxsize);
 Datum          txtidxsize(PG_FUNCTION_ARGS);
@@ -519,7 +519,7 @@ txt2txtidx(PG_FUNCTION_ARGS)
  * Trigger
  */
 Datum
-tsearch(PG_FUNCTION_ARGS)
+tsearch_trigger(PG_FUNCTION_ARGS)
 {
        TriggerData *trigdata;
        Trigger    *trigger;