database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-09 17:03:00 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
Tom Lane
2005-07-18 21:37:23 +00:00
parent 2486a88b06
commit ea72596db5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/tsearch/tsearch.sql.in
View File

@@ -145,7 +145,7 @@ CREATE OPERATOR ~# (
--Trigger --Trigger
CREATE FUNCTION tsearch() CREATE FUNCTION tsearch()
RETURNS trigger RETURNS trigger
AS 'MODULE_PATHNAME' AS 'MODULE_PATHNAME', 'tsearch_trigger'
LANGUAGE 'C'; LANGUAGE 'C';
--GiST --GiST

6
contrib/tsearch/txtidx.c
View File

@@ -33,8 +33,8 @@ Datum txtidx_out(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(txt2txtidx); PG_FUNCTION_INFO_V1(txt2txtidx);
Datum txt2txtidx(PG_FUNCTION_ARGS); Datum txt2txtidx(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(tsearch); PG_FUNCTION_INFO_V1(tsearch_trigger);
Datum tsearch(PG_FUNCTION_ARGS); Datum tsearch_trigger(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(txtidxsize); PG_FUNCTION_INFO_V1(txtidxsize);
Datum txtidxsize(PG_FUNCTION_ARGS); Datum txtidxsize(PG_FUNCTION_ARGS);
@@ -519,7 +519,7 @@ txt2txtidx(PG_FUNCTION_ARGS)
* Trigger * Trigger
*/ */
Datum Datum
tsearch(PG_FUNCTION_ARGS) tsearch_trigger(PG_FUNCTION_ARGS)
{ {
TriggerData *trigdata; TriggerData *trigdata;
Trigger *trigger; Trigger *trigger;