projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move max() to jansson_private.h, define only if not already defined
[jansson.git]
/
src
/
jansson_private.h
diff --git
a/src/jansson_private.h
b/src/jansson_private.h
index
bd80346
..
e9102ba
100644
(file)
--- a/
src/jansson_private.h
+++ b/
src/jansson_private.h
@@
-8,11
+8,17
@@
#ifndef JANSSON_PRIVATE_H
#define JANSSON_PRIVATE_H
#ifndef JANSSON_PRIVATE_H
#define JANSSON_PRIVATE_H
+#include <stddef.h>
#include "jansson.h"
#include "hashtable.h"
#define container_of(ptr_, type_, member_) \
#include "jansson.h"
#include "hashtable.h"
#define container_of(ptr_, type_, member_) \
- ((type_ *)((char *)ptr_ - (size_t)&((type_ *)0)->member_))
+ ((type_ *)((char *)ptr_ - offsetof(type_, member_)))
+
+/* On some platforms, max() may already be defined */
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
typedef struct {
json_t json;
typedef struct {
json_t json;
@@
-52,7
+58,7
@@
typedef struct {
typedef struct {
size_t serial;
typedef struct {
size_t serial;
- char key[];
+ char key[
1
];
} object_key_t;
const object_key_t *jsonp_object_iter_fullkey(void *iter);
} object_key_t;
const object_key_t *jsonp_object_iter_fullkey(void *iter);