X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fjansson_private.h;h=e9102baf874397add1e567589cdb17fe91fd135c;hb=06eb436008270420b10ed748c9f83c3d5464ff94;hp=bd80346fa6d90ce95649bc30c4596dd6e0bda591;hpb=ffbab6fedd86ee1a0c7884d62fa7233ce9d745d2;p=jansson.git

diff --git a/src/jansson_private.h b/src/jansson_private.h
index bd80346..e9102ba 100644
--- a/src/jansson_private.h
+++ b/src/jansson_private.h
@@ -8,11 +8,17 @@
 #ifndef JANSSON_PRIVATE_H
 #define JANSSON_PRIVATE_H
 
+#include <stddef.h>
 #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;
@@ -52,7 +58,7 @@ typedef struct {
 
 typedef struct {
     size_t serial;
-    char key[];
+    char key[1];
 } object_key_t;
 
 const object_key_t *jsonp_object_iter_fullkey(void *iter);