aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/tsearch/parser.l10
-rw-r--r--contrib/tsearch2/wordparser/parser.l13
2 files changed, 0 insertions, 23 deletions
diff --git a/contrib/tsearch/parser.l b/contrib/tsearch/parser.l
index 2bf3dcba076..17ac21dcd1c 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 23cfedaa201..b7f5a0013b6 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;
}
-
-
-