1 files changed, 8 insertions, 2 deletions
diff --git a/3rdParty/Expat/src/xmltok.h b/3rdParty/Expat/src/xmltok.h
index ca867aa..752007e 100644
--- a/3rdParty/Expat/src/xmltok.h
+++ b/3rdParty/Expat/src/xmltok.h
@@ -103,94 +103,100 @@ extern "C" {
 #define XML_N_LITERAL_TYPES 2
 #define XML_ATTRIBUTE_VALUE_LITERAL 0
 #define XML_ENTITY_VALUE_LITERAL 1
 
 /* The size of the buffer passed to XmlUtf8Encode must be at least this. */
 #define XML_UTF8_ENCODE_MAX 4
 /* The size of the buffer passed to XmlUtf16Encode must be at least this. */
 #define XML_UTF16_ENCODE_MAX 2
 
 typedef struct position {
   /* first line and first column are 0 not 1 */
   XML_Size lineNumber;
   XML_Size columnNumber;
 } POSITION;
 
 typedef struct {
   const char *name;
   const char *valuePtr;
   const char *valueEnd;
   char normalized;
 } ATTRIBUTE;
 
 struct encoding;
 typedef struct encoding ENCODING;
 
 typedef int (PTRCALL *SCANNER)(const ENCODING *,
                                const char *,
                                const char *,
                                const char **);
 
+enum XML_Convert_Result {
+  XML_CONVERT_COMPLETED = 0,
+  XML_CONVERT_INPUT_INCOMPLETE = 1,
+  XML_CONVERT_OUTPUT_EXHAUSTED = 2  /* and therefore potentially input remaining as well */
+};
+
 struct encoding {
   SCANNER scanners[XML_N_STATES];
   SCANNER literalScanners[XML_N_LITERAL_TYPES];
   int (PTRCALL *sameName)(const ENCODING *,
                           const char *,
                           const char *);
   int (PTRCALL *nameMatchesAscii)(const ENCODING *,
                                   const char *,
                                   const char *,
                                   const char *);
   int (PTRFASTCALL *nameLength)(const ENCODING *, const char *);
   const char *(PTRFASTCALL *skipS)(const ENCODING *, const char *);
   int (PTRCALL *getAtts)(const ENCODING *enc,
                          const char *ptr,
                          int attsMax,
                          ATTRIBUTE *atts);
   int (PTRFASTCALL *charRefNumber)(const ENCODING *enc, const char *ptr);
   int (PTRCALL *predefinedEntityName)(const ENCODING *,
                                       const char *,
                                       const char *);
   void (PTRCALL *updatePosition)(const ENCODING *,
                                  const char *ptr,
                                  const char *end,
                                  POSITION *);
   int (PTRCALL *isPublicId)(const ENCODING *enc,
                             const char *ptr,
                             const char *end,
                             const char **badPtr);
-  void (PTRCALL *utf8Convert)(const ENCODING *enc,
+  enum XML_Convert_Result (PTRCALL *utf8Convert)(const ENCODING *enc,
                               const char **fromP,
                               const char *fromLim,
                               char **toP,
                               const char *toLim);
-  void (PTRCALL *utf16Convert)(const ENCODING *enc,
+  enum XML_Convert_Result (PTRCALL *utf16Convert)(const ENCODING *enc,
                                const char **fromP,
                                const char *fromLim,
                                unsigned short **toP,
                                const unsigned short *toLim);
   int minBytesPerChar;
   char isUtf8;
   char isUtf16;
 };
 
 /* Scan the string starting at ptr until the end of the next complete
    token, but do not scan past eptr.  Return an integer giving the
    type of token.
 
    Return XML_TOK_NONE when ptr == eptr; nextTokPtr will not be set.
 
    Return XML_TOK_PARTIAL when the string does not contain a complete
    token; nextTokPtr will not be set.
 
    Return XML_TOK_INVALID when the string does not start a valid
    token; nextTokPtr will be set to point to the character which made
    the token invalid.
 
    Otherwise the string starts with a valid token; nextTokPtr will be
    set to point to the character following the end of that token.
 
    Each data character counts as a single token, but adjacent data
    characters may be returned together.  Similarly for characters in
    the prolog outside literals, comments and processing instructions.
 */