rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'kylemanna' into merge

Browse source 
Conflicts: (manually resolved)
	capn-malloc.c
	capn-stream.c
	capn-test.cpp
	capn.c
	capn.h
	compiler/capnpc-c.c
This commit is contained in:
David Lamparter 2016-02-28 12:32:59 +01:00
commit 02268ff818
5 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capn.h
View file

@ -94,7 +94,7 @@ struct capn_segment {
uint32_t id;
/* user settable */
char *data;
unsigned len, cap;
size_t len, cap;
void *user;
};
@ -262,9 +262,9 @@ void capn_reset_copy(struct capn *c);
*/
struct capn_stream {
const uint8_t *next_in;
unsigned avail_in;
size_t avail_in;
uint8_t *next_out;
unsigned avail_out;
size_t avail_out;
unsigned zeros, raw;
};