diff --git a/contrib/tsearch/parser.l b/contrib/tsearch/parser.l index 2bf3dcba076bc13672fcd3d71215607fcb0b2430..17ac21dcd1c205bea9d867822d3036343ab46f5f 100644 --- a/contrib/tsearch/parser.l +++ b/contrib/tsearch/parser.l @@ -7,16 +7,6 @@ /* Avoid exit() on fatal scanner errors (a bit ugly -- see yy_fatal_error) */ #define fprintf(file, fmt, msg) ereport(ERROR, (errmsg_internal("%s", msg))) -/* postgres allocation function */ -#define free pfree -#define malloc palloc -#define realloc repalloc - -#ifdef strdup -#undef strdup -#endif -#define strdup pstrdup - char *token = NULL; /* pointer to token */ char *s = NULL; /* to return WHOLE hyphenated-word */ diff --git a/contrib/tsearch2/wordparser/parser.l b/contrib/tsearch2/wordparser/parser.l index 23cfedaa201d6184ac65b7f50db703d47b380355..b7f5a0013b6803633c0139742757090b3eb213af 100644 --- a/contrib/tsearch2/wordparser/parser.l +++ b/contrib/tsearch2/wordparser/parser.l @@ -8,16 +8,6 @@ /* Avoid exit() on fatal scanner errors */ #define fprintf(file, fmt, msg) ts_error(ERROR, fmt, msg) -/* postgres allocation function */ -#define free pfree -#define malloc palloc -#define realloc repalloc - -#ifdef strdup -#undef strdup -#endif -#define strdup pstrdup - char *token = NULL; /* pointer to token */ char *s = NULL; /* to return WHOLE hyphenated-word */ @@ -303,6 +293,3 @@ void start_parse_str(char* str, int limit) { tsearch2_yy_switch_to_buffer( buf ); BEGIN INITIAL; } - - -