diff options
author | unknown <monty@narttu.mysql.fi> | 2003-02-28 14:32:40 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-02-28 14:32:40 +0200 |
commit | 2ef62c12aaa7593bff731ccf31575678652141fc (patch) | |
tree | 9915e21c45ef2102c75cb9a3b453898e3f90a2eb /include/my_xml.h | |
parent | 21a32d758e9f6bf9e0fb2fca6548c1e37ad1af60 (diff) | |
download | mariadb-git-2ef62c12aaa7593bff731ccf31575678652141fc.tar.gz |
Portability fixes
cmd-line-utils/libedit/readline.c:
Portability fix (For IRIX)
include/my_global.h:
Portability fix (For Tru64)
include/my_xml.h:
Portability fix (True64)
('leave' is already defined)
strings/xml.c:
Portability fix (True64)
Diffstat (limited to 'include/my_xml.h')
-rw-r--r-- | include/my_xml.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/include/my_xml.h b/include/my_xml.h index 0d968ab38c7..82de995e700 100644 --- a/include/my_xml.h +++ b/include/my_xml.h @@ -37,20 +37,26 @@ typedef struct xml_stack_st void *user_data; int (*enter)(struct xml_stack_st *st,const char *val, uint len); int (*value)(struct xml_stack_st *st,const char *val, uint len); - int (*leave)(struct xml_stack_st *st,const char *val, uint len); + int (*leave_xml)(struct xml_stack_st *st,const char *val, uint len); } MY_XML_PARSER; -void my_xml_parser_create(MY_XML_PARSER *st); -void my_xml_parser_free(MY_XML_PARSER *st); -int my_xml_parse(MY_XML_PARSER *st,const char *str, uint len); +void my_xml_parser_create(MY_XML_PARSER *st); +void my_xml_parser_free(MY_XML_PARSER *st); +int my_xml_parse(MY_XML_PARSER *st,const char *str, uint len); -void my_xml_set_value_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *, const char *, uint len)); -void my_xml_set_enter_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *, const char *, uint len)); -void my_xml_set_leave_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *, const char *, uint len)); -void my_xml_set_user_data(MY_XML_PARSER *st, void *); +void my_xml_set_value_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *, + const char *, + uint len)); +void my_xml_set_enter_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *, + const char *, + uint len)); +void my_xml_set_leave_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *, + const char *, + uint len)); +void my_xml_set_user_data(MY_XML_PARSER *st, void *); -uint my_xml_error_pos(MY_XML_PARSER *st); -uint my_xml_error_lineno(MY_XML_PARSER *st); +uint my_xml_error_pos(MY_XML_PARSER *st); +uint my_xml_error_lineno(MY_XML_PARSER *st); const char *my_xml_error_string(MY_XML_PARSER *st); |