X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fjansson_private.h;h=8bb8057c23f97616f255c38756b95cd7f94e5e51;hb=908c62f3278b682d879e8ffbdb71bcec60846977;hp=55532ebb451e9e5c923cfee7d5a58f9539b6098b;hpb=145032a57f7844c29f2c40415b46338ac3445207;p=jansson.git

diff --git a/src/jansson_private.h b/src/jansson_private.h
index 55532eb..8bb8057 100644
--- a/src/jansson_private.h
+++ b/src/jansson_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2009-2011 Petri Lehtinen <petri@digip.org>
  *
  * Jansson is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -9,23 +9,29 @@
 #define JANSSON_PRIVATE_H
 
 #include <stddef.h>
+#include <stdarg.h>
 #include "jansson.h"
 #include "hashtable.h"
 
 #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;
-    unsigned long serial;
+    size_t serial;
     int visited;
 } json_object_t;
 
 typedef struct {
     json_t json;
-    unsigned int size;
-    unsigned int entries;
+    size_t size;
+    size_t entries;
     json_t **table;
     int visited;
 } json_array_t;
@@ -42,7 +48,7 @@ typedef struct {
 
 typedef struct {
     json_t json;
-    int value;
+    json_int_t value;
 } json_integer_t;
 
 #define json_to_object(json_)  container_of(json_, json_object_t, json)
@@ -51,11 +57,20 @@ typedef struct {
 #define json_to_real(json_)   container_of(json_, json_real_t, json)
 #define json_to_integer(json_) container_of(json_, json_integer_t, json)
 
+size_t jsonp_hash_key(const void *ptr);
+int jsonp_key_equal(const void *ptr1, const void *ptr2);
+
 typedef struct {
-    unsigned long serial;
+    size_t serial;
     char key[1];
 } object_key_t;
 
 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, ...);
+void jsonp_error_vset(json_error_t *error, int line, int column,
+                      const char *msg, va_list ap);
+
 #endif