diff options
| author | Pavan Deolasee | 2015-05-05 09:19:18 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2015-05-05 09:19:18 +0000 |
| commit | 73fa25c67cbfa24c03e28c96bf356f2592671730 (patch) | |
| tree | 10ded7e26abd78d93658cb72fc5cb9d4672eff2a /contrib/xml2/xpath.c | |
| parent | da4d108859bcd7a308ca75aba54281e32968822c (diff) | |
| parent | 4a9ab6d8619817f9e3989c99b65140e19041dab7 (diff) | |
Merge branch 'XL_MASTER_MERGE_9_4' into XL_NEW_MASTER
Conflicts:
src/test/regress/expected/aggregates.out
src/test/regress/expected/create_index.out
src/test/regress/expected/inherit.out
src/test/regress/expected/join.out
src/test/regress/expected/window.out
src/test/regress/expected/with.out
Diffstat (limited to 'contrib/xml2/xpath.c')
| -rw-r--r-- | contrib/xml2/xpath.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index 660d25c349..a8b159ebff 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -6,6 +6,7 @@ */ #include "postgres.h" +#include "access/htup_details.h" #include "executor/spi.h" #include "fmgr.h" #include "funcapi.h" @@ -25,17 +26,6 @@ PG_MODULE_MAGIC; -/* externally accessible functions */ - -Datum xml_is_well_formed(PG_FUNCTION_ARGS); -Datum xml_encode_special_chars(PG_FUNCTION_ARGS); -Datum xpath_nodeset(PG_FUNCTION_ARGS); -Datum xpath_string(PG_FUNCTION_ARGS); -Datum xpath_number(PG_FUNCTION_ARGS); -Datum xpath_bool(PG_FUNCTION_ARGS); -Datum xpath_list(PG_FUNCTION_ARGS); -Datum xpath_table(PG_FUNCTION_ARGS); - /* exported for use by xslt_proc.c */ PgXmlErrorContext *pgxml_parser_init(PgXmlStrictness strictness); @@ -719,7 +709,7 @@ xpath_table(PG_FUNCTION_ARGS) /* * Clear the values array, so that not-well-formed documents - * return NULL in all columns. Note that this also means that + * return NULL in all columns. Note that this also means that * spare columns will be NULL. */ for (j = 0; j < ret_tupdesc->natts; j++) |