Merge branch '1.2'

This commit is contained in:
Petri Lehtinen 2010-05-07 07:36:01 +03:00
commit 782acfe378

View File

@ -113,7 +113,8 @@ static void error_set(json_error_t *error, const lex_t *lex,
/*** lexical analyzer ***/ /*** lexical analyzer ***/
void stream_init(stream_t *stream, get_func get, eof_func eof, void *data) static void
stream_init(stream_t *stream, get_func get, eof_func eof, void *data)
{ {
stream->get = get; stream->get = get;
stream->eof = eof; stream->eof = eof;