1 files changed, 54 insertions, 8 deletions
diff --git a/src/plist.h b/src/plist.h
index 2a9a3b5..7228696 100644
--- a/src/plist.h
+++ b/src/plist.h
@@ -22,18 +22,44 @@
 #ifndef PLIST_H
 #define PLIST_H
 
-#include "plist/plist.h"
-#include "common.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 
 #ifdef _MSC_VER
 #pragma warning(disable:4996)
 #pragma warning(disable:4244)
+#include <winsock2.h>
+#else
+#include <sys/time.h>
 #endif
 
+#ifdef LIBPLIST_STATIC
+  #define PLIST_API
+#elif defined(_WIN32)
+  #define PLIST_API __declspec( dllexport )
+#else
+  #if __GNUC__ >= 4
+    #define PLIST_API __attribute__((visibility("default")))
+  #else
+    #define PLIST_API
+  #endif
+#endif
+
+#include "node.h"
+
+#ifndef PLIST_MAX_NESTING_DEPTH
+#ifdef NODE_MAX_DEPTH
+#define PLIST_MAX_NESTING_DEPTH NODE_MAX_DEPTH
+#else
+#define PLIST_MAX_NESTING_DEPTH 512
+#endif
+#endif
+
+#include "plist/plist.h"
 
 struct plist_data_s
 {
@@ -44,7 +70,7 @@ struct plist_data_s
         double realval;
         char *strval;
         uint8_t *buff;
-        struct timeval timeval;
+        void *hashtable;
     };
     uint64_t length;
     plist_type type;
@@ -52,10 +78,30 @@ struct plist_data_s
 
 typedef struct plist_data_s *plist_data_t;
 
-_PLIST_INTERNAL plist_t plist_new_node(plist_data_t data);
-_PLIST_INTERNAL plist_data_t plist_get_data(const plist_t node);
-_PLIST_INTERNAL plist_data_t plist_new_plist_data(void);
-_PLIST_INTERNAL int plist_data_compare(const void *a, const void *b);
+plist_t plist_new_node(plist_data_t data);
+plist_data_t plist_get_data(plist_t node);
+plist_data_t plist_new_plist_data(void);
+void plist_free_data(plist_data_t data);
+int plist_data_compare(const void *a, const void *b);
+
+extern plist_err_t plist_write_to_string_default(plist_t plist, char **output, uint32_t* length, plist_write_options_t options);
+extern plist_err_t plist_write_to_string_limd(plist_t plist, char **output, uint32_t* length, plist_write_options_t options);
+extern plist_err_t plist_write_to_string_plutil(plist_t plist, char **output, uint32_t* length, plist_write_options_t options);
+extern plist_err_t plist_write_to_stream_default(plist_t plist, FILE *stream, plist_write_options_t options);
+extern plist_err_t plist_write_to_stream_limd(plist_t plist, FILE *stream, plist_write_options_t options);
+extern plist_err_t plist_write_to_stream_plutil(plist_t plist, FILE *stream, plist_write_options_t options);
 
+static inline unsigned int plist_node_ptr_hash(const void *ptr)
+{
+    uintptr_t h = (uintptr_t)ptr;
+    h ^= (h >> 16);
+    h *= 0x85ebca6b;
+    return (unsigned int)h;
+}
+
+static inline int plist_node_ptr_compare(const void *a, const void *b)
+{
+    return a == b;
+}
 
 #endif