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 842ca22adca5dd6ef17bc333420f3678ce883e73..84af414b4b3c3dbf4cdbe5d0ba7d85d8cd3a2cc2 100644 (file)
--- 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 7191b53497ba25c74ab8665cb428a35b5c5a83a6..7066649c3bc5cca67841aac44c758bebd0172342 100644 (file)
--- 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 3221a15708d21af8d9198851e731329482489d9b..f6e7ca62f5789161b82a59006f45d9a01c0585eb 100644 (file)
--- 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);