From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Wed, 25 Apr 2012 02:54:07 +0000 (-0500)
Subject: Since we already use a local json_bool type, replace any stdbool.h usage with
X-Git-Tag: json-c-0.10-20120530~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e000a65e671588749a670c5d954ffa8d2d41b0a;p=thirdparty%2Fjson-c.git

Since we already use a local json_bool type, replace any stdbool.h usage with
 that, since not all environments actually have a stdbool.h to use.
---

diff --git a/json_object.c b/json_object.c
index 842ca22a..84af414b 100644
--- a/json_object.c
+++ b/json_object.c
@@ -25,7 +25,6 @@
 #include "json_object.h"
 #include "json_object_private.h"
 #include "json_util.h"
-#include "json_tokener.h"
 
 #if !HAVE_STRNDUP
   char* strndup(const char* str, size_t n);
diff --git a/json_object_iterator.c b/json_object_iterator.c
index 7191b534..7066649c 100644
--- a/json_object_iterator.c
+++ b/json_object_iterator.c
@@ -16,7 +16,6 @@
 */
 
 #include <stddef.h>
-#include <stdbool.h>
 
 #include "json.h"
 #include "json_object_private.h"
@@ -139,7 +138,7 @@ json_object_iter_peek_value(const struct json_object_iterator* iter)
 /**
  * ****************************************************************************
  */
-bool
+json_bool
 json_object_iter_equal(const struct json_object_iterator* iter1,
                        const struct json_object_iterator* iter2)
 {
diff --git a/json_object_iterator.h b/json_object_iterator.h
index 3221a157..f6e7ca62 100644
--- a/json_object_iterator.h
+++ b/json_object_iterator.h
@@ -24,7 +24,6 @@
 #define JSON_OBJECT_ITERATOR_H
 
 #include <stddef.h>
-#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -223,11 +222,11 @@ json_object_iter_peek_value(const struct json_object_iterator* iter);
  *       	different JSON Object instances are passed, bad things
  *       	will happen!
  *
- * @return bool non-zero if iterators are equal (i.e., both
+ * @return json_bool non-zero if iterators are equal (i.e., both
  *         reference the same name/value pair or are both at
  *         "end"); zero if they are not equal.
  */
-bool
+json_bool
 json_object_iter_equal(const struct json_object_iterator* iter1,
                        const struct json_object_iterator* iter2);