New upstream version 2.0.0upstream/2.0.0

29 files changed, 4 insertions, 0 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 00a884b..00a884b 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 3558c7d..3558c7d 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 450b898..450b898 100644..100755
--- a/yajl/yajl_gen.c
+++ b/yajl/yajl_gen.c
diff --git a/yajl/yajl_gen.h b/yajl/yajl_gen.h
index 47f723d..710ff03 100644..100755
--- a/yajl/yajl_gen.h
+++ b/yajl/yajl_gen.h
@@ -137,6 +137,10 @@ extern "C" {
     YAJL_API yajl_gen_status yajl_gen_map_close(yajl_gen hand);
     YAJL_API yajl_gen_status yajl_gen_array_open(yajl_gen hand);
     YAJL_API yajl_gen_status yajl_gen_array_close(yajl_gen hand);
+	YAJL_API yajl_gen_status yajl_gen_c_comment(yajl_gen g, const unsigned char * str,
+                                                unsigned int len, int dlytoeol);
+	YAJL_API yajl_gen_status yajl_gen_cpp_comment(yajl_gen g, const unsigned char * str,
+	                                              unsigned int len);
 
     /** access the null terminated generator buffer.  If incrementally
      *  outputing JSON, one should call yajl_gen_clear to clear the
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 07ce279..07ce279 100644..100755
--- a/yajl/yajl_parser.c
+++ b/yajl/yajl_parser.c
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_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 d5cc286..d5cc286 100644..100755
--- a/yajl/yajl_tree.h
+++ b/yajl/yajl_tree.h
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