From 359fc1b69e393ed472d8771c08d43e770f10d39d Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 27 Apr 2012 13:21:31 -0400 Subject: [PATCH] Move YAJL_API to front of declarations. --- src/libCom/yajl/yajl_gen.h | 28 ++++++++++++++-------------- src/libCom/yajl/yajl_parse.h | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/libCom/yajl/yajl_gen.h b/src/libCom/yajl/yajl_gen.h index 8b814241c..1ae320eae 100644 --- a/src/libCom/yajl/yajl_gen.h +++ b/src/libCom/yajl/yajl_gen.h @@ -83,38 +83,38 @@ extern "C" { * * \returns an allocated handle on success, NULL on failure (bad params) */ - yajl_gen YAJL_API yajl_gen_alloc(const yajl_gen_config * config, + YAJL_API yajl_gen yajl_gen_alloc(const yajl_gen_config * config, const yajl_alloc_funcs * allocFuncs); /** free a generator handle */ - void YAJL_API yajl_gen_free(yajl_gen handle); + YAJL_API void yajl_gen_free(yajl_gen handle); - yajl_gen_status YAJL_API yajl_gen_integer(yajl_gen hand, long int number); - yajl_gen_status YAJL_API yajl_gen_double(yajl_gen hand, double number); - yajl_gen_status YAJL_API yajl_gen_number(yajl_gen hand, + YAJL_API yajl_gen_status yajl_gen_integer(yajl_gen hand, long int number); + YAJL_API yajl_gen_status yajl_gen_double(yajl_gen hand, double number); + YAJL_API yajl_gen_status yajl_gen_number(yajl_gen hand, const char * num, unsigned int len); - yajl_gen_status YAJL_API yajl_gen_string(yajl_gen hand, + YAJL_API yajl_gen_status yajl_gen_string(yajl_gen hand, const unsigned char * str, unsigned int len); - yajl_gen_status YAJL_API yajl_gen_null(yajl_gen hand); - yajl_gen_status YAJL_API yajl_gen_bool(yajl_gen hand, int boolean); - yajl_gen_status YAJL_API yajl_gen_map_open(yajl_gen hand); - yajl_gen_status YAJL_API yajl_gen_map_close(yajl_gen hand); - yajl_gen_status YAJL_API yajl_gen_array_open(yajl_gen hand); - yajl_gen_status YAJL_API yajl_gen_array_close(yajl_gen hand); + YAJL_API yajl_gen_status yajl_gen_null(yajl_gen hand); + YAJL_API yajl_gen_status yajl_gen_bool(yajl_gen hand, int boolean); + YAJL_API yajl_gen_status yajl_gen_map_open(yajl_gen hand); + YAJL_API yajl_gen_status yajl_gen_map_close(yajl_gen hand); + YAJL_API yajl_gen_status yajl_gen_array_open(yajl_gen hand); + YAJL_API yajl_gen_status yajl_gen_array_close(yajl_gen hand); /** access the null terminated generator buffer. If incrementally * outputing JSON, one should call yajl_gen_clear to clear the * buffer. This allows stream generation. */ - yajl_gen_status YAJL_API yajl_gen_get_buf(yajl_gen hand, + YAJL_API yajl_gen_status yajl_gen_get_buf(yajl_gen hand, const unsigned char ** buf, unsigned int * len); /** clear yajl's output buffer, but maintain all internal generation * state. This function will not "reset" the generator state, and is * intended to enable incremental JSON outputing. */ - void YAJL_API yajl_gen_clear(yajl_gen hand); + YAJL_API void yajl_gen_clear(yajl_gen hand); #ifdef __cplusplus } diff --git a/src/libCom/yajl/yajl_parse.h b/src/libCom/yajl/yajl_parse.h index 64d484013..d6b26baa7 100644 --- a/src/libCom/yajl/yajl_parse.h +++ b/src/libCom/yajl/yajl_parse.h @@ -127,20 +127,20 @@ extern "C" { * \param config configuration parameters for the parse. * \param ctx a context pointer that will be passed to callbacks. */ - yajl_handle YAJL_API yajl_alloc(const yajl_callbacks * callbacks, + YAJL_API yajl_handle yajl_alloc(const yajl_callbacks * callbacks, const yajl_parser_config * config, const yajl_alloc_funcs * allocFuncs, void * ctx); /** free a parser handle */ - void YAJL_API yajl_free(yajl_handle handle); + YAJL_API void yajl_free(yajl_handle handle); /** Parse some json! * \param hand - a handle to the json parser allocated with yajl_alloc * \param jsonText - a pointer to the UTF8 json text to be parsed * \param jsonTextLength - the length, in bytes, of input text */ - yajl_status YAJL_API yajl_parse(yajl_handle hand, + YAJL_API yajl_status yajl_parse(yajl_handle hand, const unsigned char * jsonText, unsigned int jsonTextLength); @@ -170,7 +170,7 @@ extern "C" { unsigned int jsonTextLength); /** free an error returned from yajl_get_error */ - void YAJL_API yajl_free_error(yajl_handle hand, unsigned char * str); + YAJL_API void yajl_free_error(yajl_handle hand, unsigned char * str); #ifdef __cplusplus }