From 1fad1f8984baa0de258b09c06f0870e298be6c85 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 21 Feb 2014 16:27:48 +1300
Subject: [PATCH] lib/base: Rename strbuf to heim_strbuf to avoid conflict with
 stropts.h on linux

---
 lib/base/json.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/base/json.c b/lib/base/json.c
index 290714ce8..1abf0e7a7 100644
--- a/lib/base/json.c
+++ b/lib/base/json.c
@@ -57,7 +57,7 @@ struct twojson {
     int first;
 };
 
-struct strbuf {
+struct heim_strbuf {
     char *str;
     size_t len;
     size_t alloced;
@@ -723,7 +723,7 @@ heim_show(heim_object_t obj)
 static void
 strbuf_add(void *ctx, const char *str)
 {
-    struct strbuf *strbuf = ctx;
+    struct heim_strbuf *strbuf = ctx;
     size_t len;
 
     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_string_t str;
-    struct strbuf strbuf;
+    struct heim_strbuf strbuf;
     int ret;
 
     if (error)