X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fjansson_private.h;h=951780c6a061af6c012df6cdcdb376c9981823d4;hb=5422a862de2354b3419ef628bac5a18c6ef522da;hp=e9e0097f22424c2a639f4f6897612af116396cff;hpb=56643d4311ecb26001527520da6264d92eab3d76;p=jansson.git

diff --git a/src/jansson_private.h b/src/jansson_private.h
index e9e0097..951780c 100644
--- 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;
@@ -58,4 +63,8 @@ typedef struct {
 
 const object_key_t *jsonp_object_iter_fullkey(void *iter);
 
+void jsonp_error_init(json_error_t *error, const char *source);
+void jsonp_error_set(json_error_t *error, int line, int column,
+                     const char *msg, ...);
+
 #endif