ox.h in ox-1.6.7

- old
+ new

@@ -184,10 +184,15 @@
     char	circular;	/* YesNo */
     char	xsd_date;	/* YesNo */
     char	mode;		/* LoadMode */
     char	effort;		/* Effort */
     char	sym_keys;	/* symbolize keys */
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_encoding	*rb_enc;
+#else
+    void	*rb_enc;
+#endif
 } *Options;
 
 /* parse information structure */
 struct _PInfo {
     struct _Helper	helpers[MAX_DEPTH];
@@ -195,15 +200,10 @@
     char		*str;		/* buffer being read from */
     char		*s;		/* current position in buffer */
     VALUE		obj;
     ParseCallbacks	pcb;
     CircArray		circ_array;
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding		*encoding;
-#else
-    void		*encoding;
-#endif
     unsigned long	id;		/* set for text types when cirs_array is set */
     Options		options;
 };
 
 extern VALUE	ox_parse(char *xml, ParseCallbacks pcb, char **endp, Options options);
@@ -232,9 +232,10 @@
 extern ID	ox_doctype_id;
 extern ID	ox_end_element_id;
 extern ID	ox_end_id;
 extern ID	ox_error_id;
 extern ID	ox_excl_id;
+extern ID	ox_external_encoding_id;
 extern ID	ox_fileno_id;
 extern ID	ox_inspect_id;
 extern ID	ox_instruct_id;
 extern ID	ox_jd_id;
 extern ID	ox_keys_id;