-#define xml_ReaderRead( a ) a->pf_read( a )
-#define xml_ReaderNodeType( a ) a->pf_node_type( a )
-#define xml_ReaderName( a ) a->pf_name( a )
-#define xml_ReaderValue( a ) a->pf_value( a )
-#define xml_ReaderNextAttr( a ) a->pf_next_attr( a )
-#define xml_ReaderUseDTD( a, b ) a->pf_use_dtd( a, b )
-
-#define XML_READER_NONE 0
-#define XML_READER_STARTELEM 1
-#define XML_READER_ENDELEM 2
-#define XML_READER_TEXT 3
+static inline int xml_ReaderRead( xml_reader_t *reader )
+{
+ return reader->pf_read( reader );
+}
+
+static inline int xml_ReaderNodeType( xml_reader_t *reader )
+{
+ return reader->pf_node_type( reader );
+}
+
+static inline char *xml_ReaderName( xml_reader_t *reader )
+{
+ return reader->pf_name( reader );
+}
+
+static inline char *xml_ReaderValue( xml_reader_t *reader )
+{
+ return reader->pf_value( reader );
+}
+
+static inline int xml_ReaderNextAttr( xml_reader_t *reader )
+{
+ return reader->pf_next_attr( reader );
+}
+
+static inline int xml_ReaderUseDTD( xml_reader_t *reader )
+{
+ return reader->pf_use_dtd( reader );
+}
+
+enum {
+ XML_READER_NONE=0,
+ XML_READER_STARTELEM,
+ XML_READER_ENDELEM,
+ XML_READER_TEXT,
+};