ext/ox/ox.h in ox-1.2.11 vs ext/ox/ox.h in ox-1.2.12
- old
+ new
@@ -36,11 +36,15 @@
#if 0
} /* satisfy cc-mode */
#endif
#endif
+#include "ruby.h"
+#ifdef HAVE_RUBY_ENCODING_H
+// RUBY_T_NIL defined for Ruby 1.9
#include "ruby/encoding.h"
+#endif
#include "cache.h"
#define raise_error(msg, xml, current) _raise_error(msg, xml, current, __FILE__, __LINE__)
#define MAX_TEXT_LEN 4096
@@ -161,10 +165,12 @@
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;
+#endif
unsigned long id; /* set for text types when cirs_array is set */
int trace;
Effort effort;
};