diff options
| author | Gregory P. Smith <greg@krypto.org> | 2012-07-14 21:12:35 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2012-07-14 21:12:35 (GMT) |
| commit | 7c6309c6afebecd9cefe7c547b87cf23abcbe2a3 (patch) | |
| tree | 9852412a7bad47617cd0d42e01d37e3400229b04 /Modules/expat/xmlrole.c | |
| parent | 15810673dc33436cbf8d1a6a6f9622249845b205 (diff) | |
| download | cpython-7c6309c6afebecd9cefe7c547b87cf23abcbe2a3.zip cpython-7c6309c6afebecd9cefe7c547b87cf23abcbe2a3.tar.gz cpython-7c6309c6afebecd9cefe7c547b87cf23abcbe2a3.tar.bz2 | |
Update the embedded copy of the expat XML parser to 2.1.0. It brings
with it a vareity of bug fixes, both security and behavior. See
http://www.libexpat.org/ for the list.
NOTE: I already backported the expat hash randomization fix in March.
Fixes issue #14340.
Diffstat (limited to 'Modules/expat/xmlrole.c')
| -rw-r--r-- | Modules/expat/xmlrole.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c index 15d4d8f..44772e2 100644 --- a/Modules/expat/xmlrole.c +++ b/Modules/expat/xmlrole.c @@ -2,20 +2,22 @@ See the file COPYING for copying permission. */ +#include <stddef.h> + #ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" -#elif defined(__amigaos4__) +#elif defined(__amigaos__) #include "amigaconfig.h" +#elif defined(__WATCOMC__) +#include "watcomconfig.h" #else #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> #endif #endif /* ndef COMPILED_FROM_DSP */ -#include <stddef.h> - #include "expat_external.h" #include "internal.h" #include "xmlrole.h" @@ -53,12 +55,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' }; +#ifdef XML_DTD 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' }; +#ifdef XML_DTD 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[] = { |