oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

lib/base: Rename strbuf to heim_strbuf to avoid conflict with stropts.h on linux

Browse Source
This commit is contained in:
Andrew Bartlett
2014-02-21 16:27:48 +13:00
committed by Nicolas Williams
parent 9f392c134f
commit 1fad1f8984
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/json.c
View File

@@ -57,7 +57,7 @@ struct twojson {
int first; int first;
}; };
struct strbuf { struct heim_strbuf {
char *str; char *str;
size_t len; size_t len;
size_t alloced; size_t alloced;
@@ -723,7 +723,7 @@ heim_show(heim_object_t obj)
static void static void
strbuf_add(void *ctx, const char *str) strbuf_add(void *ctx, const char *str)
{ {
struct strbuf *strbuf = ctx; struct heim_strbuf *strbuf = ctx;
size_t len; size_t len;
if (strbuf->enomem) if (strbuf->enomem)
@@ -767,7 +767,7 @@ heim_string_t
heim_json_copy_serialize(heim_object_t obj, heim_json_flags_t flags, heim_error_t *error) heim_json_copy_serialize(heim_object_t obj, heim_json_flags_t flags, heim_error_t *error)
{ {
heim_string_t str; heim_string_t str;
struct strbuf strbuf; struct heim_strbuf strbuf;
int ret; int ret;
if (error) if (error)