expat/lib xmlparse.c,1.85,1.86 xmltok.c,1.23,1.24 xmltok.h,1.5,1.6 xmltok_impl.c,1.7,1.8 xmltok_ns.c,1.4,1.5

"Karl Waclawek" <[email protected]>
Newsgroups gmane.text.xml.expat.cvs
Message-ID <[email protected]>
Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv14783

Modified Files:
	xmlparse.c xmltok.c xmltok.h xmltok_impl.c xmltok_ns.c 
Log Message:
Fred and I added FASTCALL directives to xmltok.c and related files.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- xmlparse.c	5 Sep 2002 01:58:27 -0000	1.85
+++ xmlparse.c	5 Sep 2002 18:21:00 -0000	1.86
@@ -94,8 +94,8 @@
 #endif /* HAVE_BCOPY */
 #endif /* HAVE_MEMMOVE */
 
-#include "xmltok.h"
 #include "internal.h"
+#include "xmltok.h"
 #include "xmlrole.h"
 
 typedef const XML_Char *KEY;
@@ -899,7 +899,7 @@
   int oldParamEntityParsing = paramEntityParsing;
   int oldInEntityValue = prologState.inEntityValue;
 #endif
-  int oldns_triplets = ns_triplets;
+  XML_Bool oldns_triplets = ns_triplets;
 
   /* Note that the magical uses of the pre-processor to make field
      access look more like C++ require that `parser' be overwritten

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- xmltok.c	27 Aug 2002 00:28:48 -0000	1.23
+++ xmltok.c	5 Sep 2002 18:21:01 -0000	1.24
@@ -10,6 +10,7 @@
 #include <expat_config.h>
 #endif /* ndef COMPILED_FROM_DSP */
 
+#include "internal.h"
 #include "xmltok.h"
 #include "nametab.h"
 
@@ -111,19 +112,19 @@
     || \
     ((*p) == 0xF4 ? (p)[1] > 0x8F : ((p)[1] & 0xC0) == 0xC0)))
 
-static int
+static int FASTCALL
 isNever(const ENCODING *enc, const char *p)
 {
   return 0;
 }
 
-static int
+static int FASTCALL
 utf8_isName2(const ENCODING *enc, const char *p)
 {
   return UTF8_GET_NAMING2(namePages, (const unsigned char *)p);
 }
 
-static int
+static int FASTCALL
 utf8_isName3(const ENCODING *enc, const char *p)
 {
   return UTF8_GET_NAMING3(namePages, (const unsigned char *)p);
@@ -131,13 +132,13 @@
 
 #define utf8_isName4 isNever
 
-static int
+static int FASTCALL
 utf8_isNmstrt2(const ENCODING *enc, const char *p)
 {
   return UTF8_GET_NAMING2(nmstrtPages, (const unsigned char *)p);
 }
 
-static int
+static int FASTCALL
 utf8_isNmstrt3(const ENCODING *enc, const char *p)
 {
   return UTF8_GET_NAMING3(nmstrtPages, (const unsigned char *)p);
@@ -145,19 +146,19 @@
 
 #define utf8_isNmstrt4 isNever
 
-static int
+static int FASTCALL
 utf8_isInvalid2(const ENCODING *enc, const char *p)
 {
   return UTF8_INVALID2((const unsigned char *)p);
 }
 
-static int
+static int FASTCALL
 utf8_isInvalid3(const ENCODING *enc, const char *p)
 {
   return UTF8_INVALID3((const unsigned char *)p);
 }
 
-static int
+static int FASTCALL
 utf8_isInvalid4(const ENCODING *enc, const char *p)
 {
   return UTF8_INVALID4((const unsigned char *)p);
@@ -167,21 +168,21 @@
   ENCODING enc;
   unsigned char type[256];
 #ifdef XML_MIN_SIZE
-  int (*byteType)(const ENCODING *, const char *);
-  int (*isNameMin)(const ENCODING *, const char *);
-  int (*isNmstrtMin)(const ENCODING *, const char *);
-  int (*byteToAscii)(const ENCODING *, const char *);
-  int (*charMatches)(const ENCODING *, const char *, int);
+  int (FASTCALL *byteType)(const ENCODING *, const char *);
+  int (FASTCALL *isNameMin)(const ENCODING *, const char *);
+  int (FASTCALL *isNmstrtMin)(const ENCODING *, const char *);
+  int (FASTCALL *byteToAscii)(const ENCODING *, const char *);
+  int (FASTCALL *charMatches)(const ENCODING *, const char *, int);
 #endif /* XML_MIN_SIZE */
-  int (*isName2)(const ENCODING *, const char *);
-  int (*isName3)(const ENCODING *, const char *);
-  int (*isName4)(const ENCODING *, const char *);
-  int (*isNmstrt2)(const ENCODING *, const char *);
-  int (*isNmstrt3)(const ENCODING *, const char *);
-  int (*isNmstrt4)(const ENCODING *, const char *);
-  int (*isInvalid2)(const ENCODING *, const char *);
-  int (*isInvalid3)(const ENCODING *, const char *);
-  int (*isInvalid4)(const ENCODING *, const char *);
+  int (FASTCALL *isName2)(const ENCODING *, const char *);
+  int (FASTCALL *isName3)(const ENCODING *, const char *);
+  int (FASTCALL *isName4)(const ENCODING *, const char *);
+  int (FASTCALL *isNmstrt2)(const ENCODING *, const char *);
+  int (FASTCALL *isNmstrt3)(const ENCODING *, const char *);
+  int (FASTCALL *isNmstrt4)(const ENCODING *, const char *);
+  int (FASTCALL *isInvalid2)(const ENCODING *, const char *);
+  int (FASTCALL *isInvalid3)(const ENCODING *, const char *);
+  int (FASTCALL *isInvalid4)(const ENCODING *, const char *);
 };
 
 #define AS_NORMAL_ENCODING(enc)   ((const struct normal_encoding *) (enc))
@@ -212,7 +213,7 @@
  E ## isInvalid3, \
  E ## isInvalid4
 
-static int checkCharRefNumber(int);
+static int FASTCALL checkCharRefNumber(int);
 
 #include "xmltok_impl.h"
 #include "ascii.h"
@@ -233,7 +234,7 @@
   (((struct normal_encoding *)(enc))->type[(unsigned char)*(p)])
 
 #ifdef XML_MIN_SIZE
-static int
+static int FASTCALL
 sb_byteType(const ENCODING *enc, const char *p)
 {
   return SB_BYTE_TYPE(enc, p);
@@ -247,7 +248,7 @@
 #ifdef XML_MIN_SIZE
 #define BYTE_TO_ASCII(enc, p) \
  (AS_NORMAL_ENCODING(enc)->byteToAscii(enc, p))
-static int
+static int FASTCALL
 sb_byteToAscii(const ENCODING *enc, const char *p)
 {
   return *p;
@@ -276,7 +277,7 @@
 #ifdef XML_MIN_SIZE
 #define CHAR_MATCHES(enc, p, c) \
  (AS_NORMAL_ENCODING(enc)->charMatches(enc, p, c))
-static int
+static int FASTCALL
 sb_charMatches(const ENCODING *enc, const char *p, int c)
 {
   return *p == c;
@@ -306,7 +307,7 @@
   UTF8_cval4 = 0xf0
 };
 
-static void
+static void FASTCALL
 utf8_toUtf8(const ENCODING *enc,
             const char **fromP, const char *fromLim,
             char **toP, const char *toLim)
@@ -325,7 +326,7 @@
   *toP = to;
 }
 
-static void
+static void FASTCALL
 utf8_toUtf16(const ENCODING *enc,
              const char **fromP, const char *fromLim,
              unsigned short **toP, const unsigned short *toLim)
@@ -413,7 +414,7 @@
   STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_)
 };
 
-static void
+static void FASTCALL
 latin1_toUtf8(const ENCODING *enc,
               const char **fromP, const char *fromLim,
               char **toP, const char *toLim)
@@ -438,7 +439,7 @@
   }
 }
 
-static void
+static void FASTCALL
 latin1_toUtf16(const ENCODING *enc,
                const char **fromP, const char *fromLim,
                unsigned short **toP, const unsigned short *toLim)
@@ -471,7 +472,7 @@
   STANDARD_VTABLE(sb_)
 };
 
-static void
+static void FASTCALL
 ascii_toUtf8(const ENCODING *enc,
              const char **fromP, const char *fromLim,
              char **toP, const char *toLim)
@@ -504,7 +505,7 @@
   STANDARD_VTABLE(sb_)
 };
 
-static int
+static int FASTCALL
 unicode_byte_type(char hi, char lo)
 {
   switch ((unsigned char)hi) {
@@ -524,7 +525,7 @@
 }
 
 #define DEFINE_UTF16_TO_UTF8(E) \
-static void \
+static void  FASTCALL \
 E ## toUtf8(const ENCODING *enc, \
             const char **fromP, const char *fromLim, \
             char **toP, const char *toLim) \
@@ -587,7 +588,7 @@
 }
 
 #define DEFINE_UTF16_TO_UTF16(E) \
-static void \
+static void  FASTCALL \
 E ## toUtf16(const ENCODING *enc, \
              const char **fromP, const char *fromLim, \
              unsigned short **toP, const unsigned short *toLim) \
@@ -637,31 +638,31 @@
 
 #ifdef XML_MIN_SIZE
 
-static int
+static int FASTCALL
 little2_byteType(const ENCODING *enc, const char *p)
 {
   return LITTLE2_BYTE_TYPE(enc, p);
 }
 
-static int
+static int FASTCALL
 little2_byteToAscii(const ENCODING *enc, const char *p)
 {
   return LITTLE2_BYTE_TO_ASCII(enc, p);
 }
 
-static int
+static int FASTCALL
 little2_charMatches(const ENCODING *enc, const char *p, int c)
 {
   return LITTLE2_CHAR_MATCHES(enc, p, c);
 }
 
-static int
+static int FASTCALL
 little2_isNameMin(const ENCODING *enc, const char *p)
 {
   return LITTLE2_IS_NAME_CHAR_MINBPC(enc, p);
 }
 
-static int
+static int FASTCALL
 little2_isNmstrtMin(const ENCODING *enc, const char *p)
 {
   return LITTLE2_IS_NMSTRT_CHAR_MINBPC(enc, p);
@@ -776,31 +777,31 @@
 
 #ifdef XML_MIN_SIZE
 
-static int
+static int FASTCALL
 big2_byteType(const ENCODING *enc, const char *p)
 {
   return BIG2_BYTE_TYPE(enc, p);
 }
 
-static int
+static int FASTCALL
 big2_byteToAscii(const ENCODING *enc, const char *p)
 {
   return BIG2_BYTE_TO_ASCII(enc, p);
 }
 
-static int
+static int FASTCALL
 big2_charMatches(const ENCODING *enc, const char *p, int c)
 {
   return BIG2_CHAR_MATCHES(enc, p, c);
 }
 
-static int
+static int FASTCALL
 big2_isNameMin(const ENCODING *enc, const char *p)
 {
   return BIG2_IS_NAME_CHAR_MINBPC(enc, p);
 }
 
-static int
+static int FASTCALL
 big2_isNmstrtMin(const ENCODING *enc, const char *p)
 {
   return BIG2_IS_NMSTRT_CHAR_MINBPC(enc, p);
@@ -903,7 +904,7 @@
 
 #undef PREFIX
 
-static int
+static int FASTCALL
 streqci(const char *s1, const char *s2)
 {
   for (;;) {
@@ -921,14 +922,14 @@
   return 1;
 }
 
-static void
+static void FASTCALL
 initUpdatePosition(const ENCODING *enc, const char *ptr,
                    const char *end, POSITION *pos)
 {
   normal_updatePosition(&utf8_encoding.enc, ptr, end, pos);
 }
 
-static int
+static int FASTCALL
 toAscii(const ENCODING *enc, const char *ptr, const char *end)
 {
   char buf[1];
@@ -940,7 +941,7 @@
     return buf[0];
 }
 
-static int
+static int FASTCALL
 isSpace(int c)
 {
   switch (c) {
@@ -956,7 +957,7 @@
 /* Return 1 if there's just optional white space or there's an S
    followed by name=val.
 */
-static int
+static int FASTCALL
 parsePseudoAttribute(const ENCODING *enc,
                      const char *ptr,
                      const char *end,
@@ -1154,7 +1155,7 @@
   return 1;
 }
 
-static int
+static int FASTCALL
 checkCharRefNumber(int result)
 {
   switch (result >> 8) {
@@ -1244,7 +1245,7 @@
   return sizeof(struct unknown_encoding);
 }
 
-static int
+static int FASTCALL
 unknown_isName(const ENCODING *enc, const char *p)
 {
   const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc);
@@ -1254,7 +1255,7 @@
   return UCS2_GET_NAMING(namePages, c >> 8, c & 0xFF);
 }
 
-static int
+static int FASTCALL
 unknown_isNmstrt(const ENCODING *enc, const char *p)
 {
   const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc);
@@ -1264,7 +1265,7 @@
   return UCS2_GET_NAMING(nmstrtPages, c >> 8, c & 0xFF);
 }
 
-static int
+static int FASTCALL
 unknown_isInvalid(const ENCODING *enc, const char *p)
 {
   const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc);
@@ -1272,7 +1273,7 @@
   return (c & ~0xFFFF) || checkCharRefNumber(c) < 0;
 }
 
-static void
+static void FASTCALL
 unknown_toUtf8(const ENCODING *enc,
                const char **fromP, const char *fromLim,
                char **toP, const char *toLim)
@@ -1306,7 +1307,7 @@
   }
 }
 
-static void
+static void FASTCALL
 unknown_toUtf16(const ENCODING *enc,
                 const char **fromP, const char *fromLim,
                 unsigned short **toP, const unsigned short *toLim)
@@ -1442,7 +1443,7 @@
   '\0'
 };
 
-static int
+static int FASTCALL
 getEncodingIndex(const char *name)
 {
   static const char *encodingNames[] = {
@@ -1477,7 +1478,7 @@
 */
 
 
-static int
+static int FASTCALL
 initScan(const ENCODING **encodingTable,
          const INIT_ENCODING *enc,
          int state,

Index: xmltok.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xmltok.h	1 Jul 2002 16:46:08 -0000	1.5
+++ xmltok.h	5 Sep 2002 18:21:01 -0000	1.6
@@ -125,41 +125,49 @@
 struct encoding;
 typedef struct encoding ENCODING;
 
-struct encoding {
-  int (*scanners[XML_N_STATES])(const ENCODING *,
+typedef int (FASTCALL *SCANNER)(const ENCODING *,
                                 const char *,
                                 const char *,
                                 const char **);
-  int (*literalScanners[XML_N_LITERAL_TYPES])(const ENCODING *,
-                                              const char *,
-                                              const char *,
-                                              const char **);
-  int (*sameName)(const ENCODING *,
-                  const char *, const char *);
-  int (*nameMatchesAscii)(const ENCODING *,
-                          const char *, const char *, const char *);
-  int (*nameLength)(const ENCODING *, const char *);
-  const char *(*skipS)(const ENCODING *, const char *);
-  int (*getAtts)(const ENCODING *enc, const char *ptr,
-                 int attsMax, ATTRIBUTE *atts);
-  int (*charRefNumber)(const ENCODING *enc, const char *ptr);
-  int (*predefinedEntityName)(const ENCODING *, const char *, const char *);
-  void (*updatePosition)(const ENCODING *,
-                         const char *ptr,
-                         const char *end,
-                         POSITION *);
-  int (*isPublicId)(const ENCODING *enc, const char *ptr, const char *end,
-                    const char **badPtr);
-  void (*utf8Convert)(const ENCODING *enc,
-                      const char **fromP,
-                      const char *fromLim,
-                      char **toP,
-                      const char *toLim);
-  void (*utf16Convert)(const ENCODING *enc,
-                       const char **fromP,
-                       const char *fromLim,
-                       unsigned short **toP,
-                       const unsigned short *toLim);
+
+struct encoding {
+  SCANNER scanners[XML_N_STATES];
+  SCANNER literalScanners[XML_N_LITERAL_TYPES];
+  int (FASTCALL *sameName)(const ENCODING *,
+                           const char *,
+                           const char *);
+  int (FASTCALL *nameMatchesAscii)(const ENCODING *,
+                                   const char *,
+                                   const char *,
+                                   const char *);
+  int (FASTCALL *nameLength)(const ENCODING *, const char *);
+  const char *(FASTCALL *skipS)(const ENCODING *, const char *);
+  int (FASTCALL *getAtts)(const ENCODING *enc,
+                          const char *ptr,
+                          int attsMax,
+                          ATTRIBUTE *atts);
+  int (FASTCALL *charRefNumber)(const ENCODING *enc, const char *ptr);
+  int (FASTCALL *predefinedEntityName)(const ENCODING *,
+                                       const char *,
+                                       const char *);
+  void (FASTCALL *updatePosition)(const ENCODING *,
+                                  const char *ptr,
+                                  const char *end,
+                                  POSITION *);
+  int (FASTCALL *isPublicId)(const ENCODING *enc,
+                             const char *ptr,
+                             const char *end,
+                             const char **badPtr);
+  void (FASTCALL *utf8Convert)(const ENCODING *enc,
+                               const char **fromP,
+                               const char *fromLim,
+                               char **toP,
+                               const char *toLim);
+  void (FASTCALL *utf16Convert)(const ENCODING *enc,
+                                const char **fromP,
+                                const char *fromLim,
+                                unsigned short **toP,
+                                const unsigned short *toLim);
   int minBytesPerChar;
   char isUtf8;
   char isUtf16;

Index: xmltok_impl.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_impl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xmltok_impl.c	31 Aug 2002 02:27:20 -0000	1.7
+++ xmltok_impl.c	5 Sep 2002 18:21:01 -0000	1.8
@@ -86,7 +86,7 @@
 
 /* ptr points to character following "<!-" */
 
-static int
+static int FASTCALL
 PREFIX(scanComment)(const ENCODING *enc, const char *ptr,
                     const char *end, const char **nextTokPtr)
 {
@@ -124,7 +124,7 @@
 
 /* ptr points to character following "<!" */
 
-static int
+static int FASTCALL
 PREFIX(scanDecl)(const ENCODING *enc, const char *ptr,
                  const char *end, const char **nextTokPtr)
 {
@@ -171,7 +171,7 @@
   return XML_TOK_PARTIAL;
 }
 
-static int
+static int FASTCALL
 PREFIX(checkPiTarget)(const ENCODING *enc, const char *ptr,
                       const char *end, int *tokPtr)
 {
@@ -216,7 +216,7 @@
 
 /* ptr points to character following "<?" */
 
-static int
+static int FASTCALL
 PREFIX(scanPi)(const ENCODING *enc, const char *ptr,
                const char *end, const char **nextTokPtr)
 {
@@ -278,7 +278,7 @@
   return XML_TOK_PARTIAL;
 }
 
-static int
+static int FASTCALL
 PREFIX(scanCdataSection)(const ENCODING *enc, const char *ptr,
                          const char *end, const char **nextTokPtr)
 {
@@ -298,7 +298,7 @@
   return XML_TOK_CDATA_SECT_OPEN;
 }
 
-static int
+static int FASTCALL
 PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr,
                         const char *end, const char **nextTokPtr)
 {
@@ -376,7 +376,7 @@
 
 /* ptr points to character following "</" */
 
-static int
+static int FASTCALL
 PREFIX(scanEndTag)(const ENCODING *enc, const char *ptr,
                    const char *end, const char **nextTokPtr)
 {
@@ -425,7 +425,7 @@
 
 /* ptr points to character following "&#X" */
 
-static int
+static int FASTCALL
 PREFIX(scanHexCharRef)(const ENCODING *enc, const char *ptr,
                        const char *end, const char **nextTokPtr)
 {
@@ -457,7 +457,7 @@
 
 /* ptr points to character following "&#" */
 
-static int
+static int FASTCALL
 PREFIX(scanCharRef)(const ENCODING *enc, const char *ptr,
                     const char *end, const char **nextTokPtr)
 {
@@ -489,7 +489,7 @@
 
 /* ptr points to character following "&" */
 
-static int
+static int FASTCALL
 PREFIX(scanRef)(const ENCODING *enc, const char *ptr, const char *end,
                 const char **nextTokPtr)
 {
@@ -519,7 +519,7 @@
 
 /* ptr points to character following first character of attribute name */
 
-static int
+static int FASTCALL
 PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end,
                  const char **nextTokPtr)
 {
@@ -678,7 +678,7 @@
 
 /* ptr points to character following "<" */
 
-static int
+static int FASTCALL
 PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end,
                const char **nextTokPtr)
 {
@@ -778,7 +778,7 @@
   return XML_TOK_PARTIAL;
 }
 
-static int
+static int FASTCALL
 PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end,
                    const char **nextTokPtr)
 {
@@ -877,7 +877,7 @@
 
 /* ptr points to character following "%" */
 
-static int
+static int FASTCALL
 PREFIX(scanPercent)(const ENCODING *enc, const char *ptr, const char *end,
                     const char **nextTokPtr)
 {
@@ -906,7 +906,7 @@
   return XML_TOK_PARTIAL;
 }
 
-static int
+static int FASTCALL
 PREFIX(scanPoundName)(const ENCODING *enc, const char *ptr, const char *end,
                       const char **nextTokPtr)
 {
@@ -933,7 +933,7 @@
   return -XML_TOK_POUND_NAME;
 }
 
-static int
+static int FASTCALL
 PREFIX(scanLit)(int open, const ENCODING *enc,
                 const char *ptr, const char *end,
                 const char **nextTokPtr)
@@ -965,7 +965,7 @@
   return XML_TOK_PARTIAL;
 }
 
-static int
+static int FASTCALL
 PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end,
                   const char **nextTokPtr)
 {
@@ -1196,7 +1196,7 @@
   return -tok;
 }
 
-static int
+static int FASTCALL
 PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr,
                           const char *end, const char **nextTokPtr)
 {
@@ -1254,7 +1254,7 @@
   return XML_TOK_DATA_CHARS;
 }
 
-static int
+static int FASTCALL
 PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr,
                        const char *end, const char **nextTokPtr)
 {
@@ -1311,7 +1311,7 @@
 
 #ifdef XML_DTD
 
-static int
+static int FASTCALL
 PREFIX(ignoreSectionTok)(const ENCODING *enc, const char *ptr,
                          const char *end, const char **nextTokPtr)
 {
@@ -1364,7 +1364,7 @@
 
 #endif /* XML_DTD */
 
-static int
+static int FASTCALL
 PREFIX(isPublicId)(const ENCODING *enc, const char *ptr, const char *end,
                    const char **badPtr)
 {
@@ -1424,7 +1424,7 @@
    first attsMax attributes are stored in atts.
 */
 
-static int
+static int FASTCALL
 PREFIX(getAtts)(const ENCODING *enc, const char *ptr,
                 int attsMax, ATTRIBUTE *atts)
 {
@@ -1517,7 +1517,7 @@
   /* not reached */
 }
 
-static int
+static int FASTCALL
 PREFIX(charRefNumber)(const ENCODING *enc, const char *ptr)
 {
   int result = 0;
@@ -1561,7 +1561,7 @@
   return checkCharRefNumber(result);
 }
 
-static int
+static int FASTCALL
 PREFIX(predefinedEntityName)(const ENCODING *enc, const char *ptr,
                              const char *end)
 {
@@ -1615,7 +1615,7 @@
   return 0;
 }
 
-static int
+static int FASTCALL
 PREFIX(sameName)(const ENCODING *enc, const char *ptr1, const char *ptr2)
 {
   for (;;) {
@@ -1679,7 +1679,7 @@
   /* not reached */
 }
 
-static int
+static int FASTCALL
 PREFIX(nameMatchesAscii)(const ENCODING *enc, const char *ptr1,
                          const char *end1, const char *ptr2)
 {
@@ -1692,7 +1692,7 @@
   return ptr1 == end1;
 }
 
-static int
+static int FASTCALL
 PREFIX(nameLength)(const ENCODING *enc, const char *ptr)
 {
   const char *start = ptr;
@@ -1719,7 +1719,7 @@
   }
 }
 
-static const char *
+static const char * FASTCALL
 PREFIX(skipS)(const ENCODING *enc, const char *ptr)
 {
   for (;;) {
@@ -1735,7 +1735,7 @@
   }
 }
 
-static void
+static void FASTCALL
 PREFIX(updatePosition)(const ENCODING *enc,
                        const char *ptr,
                        const char *end,

Index: xmltok_ns.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_ns.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xmltok_ns.c	1 Jul 2002 16:46:08 -0000	1.4
+++ xmltok_ns.c	5 Sep 2002 18:21:01 -0000	1.5
@@ -29,7 +29,7 @@
   &ns(utf8_encoding).enc /* NO_ENC */
 };
 
-static int
+static int FASTCALL
 NS(initScanProlog)(const ENCODING *enc, const char *ptr, const char *end,
                    const char **nextTokPtr)
 {
@@ -37,7 +37,7 @@
                   XML_PROLOG_STATE, ptr, end, nextTokPtr);
 }
 
-static int
+static int FASTCALL
 NS(initScanContent)(const ENCODING *enc, const char *ptr, const char *end,
                     const char **nextTokPtr)
 {
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.