Applied #15226 wxRichTextCtrl: Implement setting properties with undo for objects...

[wxWidgets.git] / src / expat / lib / xmltok.h

diff --git a/src/expat/lib/xmltok.h b/src/expat/lib/xmltok.h
index 3d776be71fc947114c7b9dbedd40cd15c6f378d3..ca867aa6b429cf9ab0721ce89ee281e9529bbfad 100644 (file)
--- a/src/expat/lib/xmltok.h
+++ b/src/expat/lib/xmltok.h
@@ -111,8 +111,8 @@ extern "C" {
 
 typedef struct position {
   /* first line and first column are 0 not 1 */
-  unsigned long lineNumber;
-  unsigned long columnNumber;
+  XML_Size lineNumber;
+  XML_Size columnNumber;
 } POSITION;
 
 typedef struct {
@@ -281,7 +281,8 @@ int FASTCALL XmlUtf8Encode(int charNumber, char *buf);
 int FASTCALL XmlUtf16Encode(int charNumber, unsigned short *buf);
 int XmlSizeOfUnknownEncoding(void);
 
-typedef int (*CONVERTER)(void *userData, const char *p);
+
+typedef int (XMLCALL *CONVERTER) (void *userData, const char *p);
 
 ENCODING *
 XmlInitUnknownEncoding(void *mem,