Recognize VC12 (a.k.a. MSVS 2013) and define __VISUALC12__ for it.

[wxWidgets.git] / src / expat / lib / xmlrole.c

diff --git a/src/expat/lib/xmlrole.c b/src/expat/lib/xmlrole.c
index 79d12d53aad280c3e2514a7c9fbd500dbdaf3d34..5929993bb2b5876e66110544ae9d32dd50ff66d6 100644 (file)
--- a/src/expat/lib/xmlrole.c
+++ b/src/expat/lib/xmlrole.c
@@ -2,6 +2,8 @@
    See the file COPYING for copying permission.
 */
 
    See the file COPYING for copying permission.
 */
 

+#include <stddef.h>
+

 #ifdef COMPILED_FROM_DSP
 #include "winconfig.h"
 #elif defined(OS2_32)
 #ifdef COMPILED_FROM_DSP
 #include "winconfig.h"
 #elif defined(OS2_32)


@@ -10,10 +12,17 @@
 #include "dosconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #include "dosconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"

+#elif defined(__amigaos__)
+#include "amigaconfig.h"
+#elif defined(__WATCOMC__)
+#include "watcomconfig.h"

 #else
 #else

-#include "expat_config.h"
+#ifdef HAVE_EXPAT_CONFIG_H
+#include <expat_config.h>
+#endif

 #endif /* ndef COMPILED_FROM_DSP */
 
 #endif /* ndef COMPILED_FROM_DSP */
 

+#include "expat_external.h"

 #include "internal.h"
 #include "xmlrole.h"
 #include "ascii.h"
 #include "internal.h"
 #include "xmlrole.h"
 #include "ascii.h"


@@ -50,12 +59,16 @@ static const char KW_IDREF[] = {
     ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, '\0' };
 static const char KW_IDREFS[] = {
     ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, ASCII_S, '\0' };
     ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, '\0' };
 static const char KW_IDREFS[] = {
     ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, ASCII_S, '\0' };

+#ifdef XML_DTD

 static const char KW_IGNORE[] = {
     ASCII_I, ASCII_G, ASCII_N, ASCII_O, ASCII_R, ASCII_E, '\0' };
 static const char KW_IGNORE[] = {
     ASCII_I, ASCII_G, ASCII_N, ASCII_O, ASCII_R, ASCII_E, '\0' };

+#endif

 static const char KW_IMPLIED[] = {
     ASCII_I, ASCII_M, ASCII_P, ASCII_L, ASCII_I, ASCII_E, ASCII_D, '\0' };
 static const char KW_IMPLIED[] = {
     ASCII_I, ASCII_M, ASCII_P, ASCII_L, ASCII_I, ASCII_E, ASCII_D, '\0' };

+#ifdef XML_DTD

 static const char KW_INCLUDE[] = {
     ASCII_I, ASCII_N, ASCII_C, ASCII_L, ASCII_U, ASCII_D, ASCII_E, '\0' };
 static const char KW_INCLUDE[] = {
     ASCII_I, ASCII_N, ASCII_C, ASCII_L, ASCII_U, ASCII_D, ASCII_E, '\0' };

+#endif

 static const char KW_NDATA[] = {
     ASCII_N, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
 static const char KW_NMTOKEN[] = {
 static const char KW_NDATA[] = {
     ASCII_N, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
 static const char KW_NMTOKEN[] = {


@@ -372,6 +385,8 @@ internalSubset(PROLOG_STATE *state,
   case XML_TOK_CLOSE_BRACKET:
     state->handler = doctype5;
     return XML_ROLE_DOCTYPE_NONE;
   case XML_TOK_CLOSE_BRACKET:
     state->handler = doctype5;
     return XML_ROLE_DOCTYPE_NONE;

+  case XML_TOK_NONE:
+    return XML_ROLE_NONE;

   }
   return common(state, tok);
 }
   }
   return common(state, tok);
 }


@@ -790,7 +805,7 @@ attlist2(PROLOG_STATE *state,
     return XML_ROLE_ATTLIST_NONE;
   case XML_TOK_NAME:
     {
     return XML_ROLE_ATTLIST_NONE;
   case XML_TOK_NAME:
     {

-      static const char *types[] = {
+      static const char * const types[] = {

         KW_CDATA,
         KW_ID,
         KW_IDREF,
         KW_CDATA,
         KW_ID,
         KW_IDREF,