Browse Source

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.
tags/json-c-0.10-20120530
Eric Haszlakiewicz 13 years ago
parent
commit
4e000a65e6
3 changed files with 3 additions and 6 deletions
  1. +0
    -1
      json_object.c
  2. +1
    -2
      json_object_iterator.c
  3. +2
    -3
      json_object_iterator.h

+ 0
- 1
json_object.c View File

@@ -25,7 +25,6 @@
#include "json_object.h" #include "json_object.h"
#include "json_object_private.h" #include "json_object_private.h"
#include "json_util.h" #include "json_util.h"
#include "json_tokener.h"


#if !HAVE_STRNDUP #if !HAVE_STRNDUP
char* strndup(const char* str, size_t n); char* strndup(const char* str, size_t n);


+ 1
- 2
json_object_iterator.c View File

@@ -16,7 +16,6 @@
*/ */


#include <stddef.h> #include <stddef.h>
#include <stdbool.h>


#include "json.h" #include "json.h"
#include "json_object_private.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, json_object_iter_equal(const struct json_object_iterator* iter1,
const struct json_object_iterator* iter2) const struct json_object_iterator* iter2)
{ {


+ 2
- 3
json_object_iterator.h View File

@@ -24,7 +24,6 @@
#define JSON_OBJECT_ITERATOR_H #define JSON_OBJECT_ITERATOR_H


#include <stddef.h> #include <stddef.h>
#include <stdbool.h>


#ifdef __cplusplus #ifdef __cplusplus
extern "C" { 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 * different JSON Object instances are passed, bad things
* will happen! * 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 * reference the same name/value pair or are both at
* "end"); zero if they are not equal. * "end"); zero if they are not equal.
*/ */
bool
json_bool
json_object_iter_equal(const struct json_object_iterator* iter1, json_object_iter_equal(const struct json_object_iterator* iter1,
const struct json_object_iterator* iter2); const struct json_object_iterator* iter2);




Loading…
Cancel
Save