Imported Upstream version 1.8.0upstream/1.8.0

31 files changed, 13 insertions, 10 deletions

diff --git a/yajl/COPYING b/yajl/COPYING
index 30be349..30be349 100644..100755
--- a/yajl/COPYING
+++ b/yajl/COPYING
diff --git a/yajl/ChangeLog b/yajl/ChangeLog
index c256386..c256386 100644..100755
--- a/yajl/ChangeLog
+++ b/yajl/ChangeLog
diff --git a/yajl/Jamfile b/yajl/Jamfile
index d5456a1..d5456a1 100644..100755
--- a/yajl/Jamfile
+++ b/yajl/Jamfile
diff --git a/yajl/README b/yajl/README
index ad61759..ad61759 100644..100755
--- a/yajl/README
+++ b/yajl/README
diff --git a/yajl/TODO b/yajl/TODO
index 56c3dc0..56c3dc0 100644..100755
--- a/yajl/TODO
+++ b/yajl/TODO
diff --git a/yajl/afiles b/yajl/afiles
index 9292ab8..9292ab8 100644..100755
--- a/yajl/afiles
+++ b/yajl/afiles
diff --git a/yajl/json_verify.c b/yajl/json_verify.c
index 0cdcadb..0cdcadb 100644..100755
--- a/yajl/json_verify.c
+++ b/yajl/json_verify.c
diff --git a/yajl/yajl.c b/yajl/yajl.c
index 4f7d5e5..4f7d5e5 100644..100755
--- a/yajl/yajl.c
+++ b/yajl/yajl.c
diff --git a/yajl/yajl.h b/yajl/yajl.h
index 544d119..544d119 100644..100755
--- a/yajl/yajl.h
+++ b/yajl/yajl.h
diff --git a/yajl/yajl_alloc.c b/yajl/yajl_alloc.c
index 96ad1d3..96ad1d3 100644..100755
--- a/yajl/yajl_alloc.c
+++ b/yajl/yajl_alloc.c
diff --git a/yajl/yajl_alloc.h b/yajl/yajl_alloc.h
index 496338f..496338f 100644..100755
--- a/yajl/yajl_alloc.h
+++ b/yajl/yajl_alloc.h
diff --git a/yajl/yajl_buf.c b/yajl/yajl_buf.c
index 1aeafde..1aeafde 100644..100755
--- a/yajl/yajl_buf.c
+++ b/yajl/yajl_buf.c
diff --git a/yajl/yajl_buf.h b/yajl/yajl_buf.h
index 5528799..5528799 100644..100755
--- a/yajl/yajl_buf.h
+++ b/yajl/yajl_buf.h
diff --git a/yajl/yajl_bytestack.h b/yajl/yajl_bytestack.h
index ff9bcca..ff9bcca 100644..100755
--- a/yajl/yajl_bytestack.h
+++ b/yajl/yajl_bytestack.h
diff --git a/yajl/yajl_common.h b/yajl/yajl_common.h
index 95a5ab7..95a5ab7 100644..100755
--- a/yajl/yajl_common.h
+++ b/yajl/yajl_common.h
diff --git a/yajl/yajl_encode.c b/yajl/yajl_encode.c
index fd08258..fd08258 100644..100755
--- a/yajl/yajl_encode.c
+++ b/yajl/yajl_encode.c
diff --git a/yajl/yajl_encode.h b/yajl/yajl_encode.h
index b743c8a..b743c8a 100644..100755
--- a/yajl/yajl_encode.h
+++ b/yajl/yajl_encode.h
diff --git a/yajl/yajl_gen.c b/yajl/yajl_gen.c
index d314907..17ce003 100644..100755
--- a/yajl/yajl_gen.c
+++ b/yajl/yajl_gen.c
@@ -14,16 +14,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "yajl_gen.h"
-#include "yajl_buf.h"
-#include "yajl_encode.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
 #include <stdarg.h>
 
+#include "yajl_gen.h"
+#include "yajl_buf.h"
+#include "yajl_encode.h"
+
 typedef enum {
     yajl_gen_start,
     yajl_gen_map_start,
diff --git a/yajl/yajl_gen.h b/yajl/yajl_gen.h
index 47f723d..47f723d 100644..100755
--- a/yajl/yajl_gen.h
+++ b/yajl/yajl_gen.h
diff --git a/yajl/yajl_lex.c b/yajl/yajl_lex.c
index 8560a12..8560a12 100644..100755
--- a/yajl/yajl_lex.c
+++ b/yajl/yajl_lex.c
diff --git a/yajl/yajl_lex.h b/yajl/yajl_lex.h
index 61a0047..61a0047 100644..100755
--- a/yajl/yajl_lex.h
+++ b/yajl/yajl_lex.h
diff --git a/yajl/yajl_parse.h b/yajl/yajl_parse.h
index a3600fe..a3600fe 100644..100755
--- a/yajl/yajl_parse.h
+++ b/yajl/yajl_parse.h
diff --git a/yajl/yajl_parser.c b/yajl/yajl_parser.c
index 20d5693..07ce279 100644..100755
--- a/yajl/yajl_parser.c
+++ b/yajl/yajl_parser.c
@@ -14,12 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "yajl_parse.h"
-#include "yajl_lex.h"
-#include "yajl_parser.h"
-#include "yajl_encode.h"
-#include "yajl_bytestack.h"
-
 #include <stdlib.h>
 #include <limits.h>
 #include <errno.h>
@@ -29,6 +23,12 @@
 #include <assert.h>
 #include <math.h>
 
+#include "yajl_parse.h"
+#include "yajl_lex.h"
+#include "yajl_parser.h"
+#include "yajl_encode.h"
+#include "yajl_bytestack.h"
+
 #define MAX_VALUE_TO_MULTIPLY ((LLONG_MAX / 10) + (LLONG_MAX % 10))
 
  /* same semantics as strtol */
diff --git a/yajl/yajl_parser.h b/yajl/yajl_parser.h
index 5d87ed7..5d87ed7 100644..100755
--- a/yajl/yajl_parser.h
+++ b/yajl/yajl_parser.h
diff --git a/yajl/yajl_test.c b/yajl/yajl_test.c
index 991dd4d..991dd4d 100644..100755
--- a/yajl/yajl_test.c
+++ b/yajl/yajl_test.c
diff --git a/yajl/yajl_test.exe b/yajl/yajl_test.exe
deleted file mode 100644
index abb59cb..0000000
--- a/yajl/yajl_test.exe
+++ /dev/null
diff --git a/yajl/yajl_test.obj b/yajl/yajl_test.obj
deleted file mode 100644
index c26d088..0000000
--- a/yajl/yajl_test.obj
+++ /dev/null
diff --git a/yajl/yajl_tree.c b/yajl/yajl_tree.c
index 8e4aca3..8e4aca3 100644..100755
--- a/yajl/yajl_tree.c
+++ b/yajl/yajl_tree.c
diff --git a/yajl/yajl_tree.h b/yajl/yajl_tree.h
index dc26183..d5cc286 100644..100755
--- a/yajl/yajl_tree.h
+++ b/yajl/yajl_tree.h
@@ -165,6 +165,9 @@ yajl_val yajl_tree_get_first(yajl_val n, const char *key, yajl_type type);
  *  or NULL if the value is not a string. */
 #define YAJL_GET_STRING(v) (YAJL_IS_STRING(v) ? (v)->u.string : NULL)
 
+/* Same as above but return an allocated string or NULL */
+#define YAJL_GET_STRINGDUP(v) (YAJL_IS_STRING(v) ? strdup((v)->u.string) : NULL)
+
 /** Get the string representation of a number.  You should check type first,
  *  perhaps using YAJL_IS_NUMBER */
 #define YAJL_GET_NUMBER(v) ((v)->u.number.r)
diff --git a/yajl/yajl_version.c b/yajl/yajl_version.c
index cc7651e..cc7651e 100644..100755
--- a/yajl/yajl_version.c
+++ b/yajl/yajl_version.c
diff --git a/yajl/yajl_version.h b/yajl/yajl_version.h
index f7354d0..f7354d0 100644..100755
--- a/yajl/yajl_version.h
+++ b/yajl/yajl_version.h