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 e9e0097..e9102ba 100644 (file)
--- a/src/jansson_private.h
+++ b/src/jansson_private.h
@@ -15,6 +15,11 @@
 #define container_of(ptr_, type_, 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;
     hashtable_t hashtable;