Browse Source

Merge pull request #73 from ghazel/master

one definition of json_object_object_foreach only works on c99 and later
tags/json-c-0.11-20130402
Eric Haszlakiewicz 12 years ago
parent
commit
889400d946
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      json_object.h

+ 2
- 2
json_object.h View File

@@ -309,7 +309,7 @@ extern void json_object_object_del(struct json_object* obj, const char *key);
* @param val the local name for the json_object* object variable defined in * @param val the local name for the json_object* object variable defined in
* the body * the body
*/ */
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && __STDC_VERSION__ >= 199901L


# define json_object_object_foreach(obj,key,val) \ # define json_object_object_foreach(obj,key,val) \
char *key; \ char *key; \
@@ -337,7 +337,7 @@ extern void json_object_object_del(struct json_object* obj, const char *key);
entry ## key) : 0); \ entry ## key) : 0); \
entry ## key = entry_next ## key) entry ## key = entry_next ## key)


#endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */
#endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) && __STDC_VERSION__ >= 199901L */


/** Iterate through all keys and values of an object (ANSI C Safe) /** Iterate through all keys and values of an object (ANSI C Safe)
* @param obj the json_object instance * @param obj the json_object instance


Loading…
Cancel
Save