Index: libyaml/trunk/include/yaml/yaml.h
===================================================================
--- libyaml/trunk/include/yaml/yaml.h	(revision 184)
+++ libyaml/trunk/include/yaml/yaml.h	(revision 185)
@@ -538,7 +538,4 @@
 
 typedef struct {
-    /** Is a simple key possible? */
-    int possible;
-
     /** Is a simple key required? */
     int required;
@@ -586,4 +583,13 @@
     int problem_value;
 
+    /** The problem position. */
+    yaml_mark_t problem_mark;
+
+    /** The error context. */
+    const char *context;
+
+    /** The context position. */
+    yaml_mark_t context_mark;
+
     /**
      * @}
@@ -662,5 +668,5 @@
 
     /** The tokens queue, which contains the current produced tokens. */
-    yaml_token_t *tokens;
+    yaml_token_t **tokens;
 
     /** The size of the tokens queue. */
@@ -692,5 +698,5 @@
 
     /** The stack of potential simple keys. */
-    yaml_simple_key_t *simple_keys;
+    yaml_simple_key_t **simple_keys;
 
     /** The size of the simple keys stack. */
@@ -854,4 +860,8 @@
 yaml_free(void *ptr);
 
+/** The initial size for various buffers. */
+
+#define YAML_DEFAULT_SIZE   16
+
 /** The size of the raw buffer. */