diff options
author | Lloyd Hilaiel <lloyd@hilaiel.com> | 2011-04-22 19:21:52 -0600 |
---|---|---|
committer | Lloyd Hilaiel <lloyd@hilaiel.com> | 2011-04-22 19:21:52 -0600 |
commit | 9bf2ad882bb98710949b1e3262bddff67845bb87 (patch) | |
tree | f30c2f4962abb020a64d0bc4773db1b704053b1d | |
parent | 69a9c263b5e3c2019dc258d3e75c95ad7267ea16 (diff) | |
download | yajl-9bf2ad882bb98710949b1e3262bddff67845bb87.tar.gz |
move unnec. includes out of public api, more yajl_type propogation
-rw-r--r-- | src/api/yajl_tree.h | 5 | ||||
-rw-r--r-- | src/yajl_tree.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/api/yajl_tree.h b/src/api/yajl_tree.h index c926dec..78ed240 100644 --- a/src/api/yajl_tree.h +++ b/src/api/yajl_tree.h @@ -26,9 +26,6 @@ #ifndef YAJL_TREE_H #define YAJL_TREE_H 1 -#include <stdint.h> -#include <inttypes.h> - #include <yajl/yajl_common.h> /* Forward declaration, because "yajl_val_object_t" and "yajl_val_array" @@ -105,7 +102,7 @@ struct yajl_val_s { /** Type of the value contained. Use the "YAJL_IS_*" macors to check for a * specific type. */ - uint8_t type; + yajl_type type; /** Type-specific data. Use the "YAJL_TO_*" macros to access these * members. */ union diff --git a/src/yajl_tree.c b/src/yajl_tree.c index a917e4f..0810fdd 100644 --- a/src/yajl_tree.c +++ b/src/yajl_tree.c @@ -19,6 +19,7 @@ #include <string.h> #include <errno.h> #include <assert.h> +#include <inttypes.h> #include "api/yajl_tree.h" #include "api/yajl_parse.h" @@ -50,7 +51,7 @@ typedef struct context_s context_t; return (retval); \ } while (0) \ -static yajl_val value_alloc (uint8_t type) +static yajl_val value_alloc (yajl_type type) { yajl_val v; |