postgres.git / summary / log / commit / refs

commit    ea72596db57dd0c404f29de2ae2d661f8d5860a1
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Jul 18 21:37:23 2005 +0000
First released in: 8.0.4

    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.


 contrib/tsearch/tsearch.sql.in | 2 +-
 contrib/tsearch/txtidx.c       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/tsearch/tsearch.sql.in b/contrib/tsearch/tsearch.sql.in
index b247e232761..dda95ba2e7d 100644
--- 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 deab0bcd1de..61b29d19cf7 100644
--- 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;


[parent: 2486a88b0683]