diff options
| author | monty@narttu.mysql.fi <> | 2003-02-28 14:32:40 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-02-28 14:32:40 +0200 |
| commit | 9147f8b522885f299ed2829cc66286595a9e59bb (patch) | |
| tree | 9915e21c45ef2102c75cb9a3b453898e3f90a2eb /include | |
| parent | 050543bdfc134ab245b4d371986a96ba51896e23 (diff) | |
| download | mariadb-git-9147f8b522885f299ed2829cc66286595a9e59bb.tar.gz | |
Portability fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/my_xml.h | 26 |
2 files changed, 17 insertions, 11 deletions
diff --git a/include/my_global.h b/include/my_global.h index f9ce10336d5..dd1e8986ae2 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -110,6 +110,7 @@ #define __STDC_EXT__ 1 /* To get large file support on hpux */ #endif +#ifdef HPUX11 /* Fix warnings on HPUX11 There is something really strange with HPUX11 include files as you get @@ -121,7 +122,6 @@ #endif /* Fix type of socklen as this is depending on the above define */ -#ifdef HPUX11 #undef SOCKET_SIZE_TYPE #ifdef _XOPEN_SOURCE_EXTENDED #define SOCKET_SIZE_TYPE socklen_t 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); |