[Python-checkins] python/dist/src/Modules/expat macconfig.h, NONE, 1.1 asciitab.h, 1.1.1.1, 1.2 expat.h, 1.5, 1.6 iasciitab.h, 1.1.1.1, 1.2 internal.h, 1.1, 1.2 latin1tab.h, 1.1.1.1, 1.2 utf8tab.h, 1.1.1.1, 1.2 winconfig.h, 1.1.1.1, 1.2 xmlparse.c, 1.5, 1.6 xmlrole.c, 1.5, 1.6 xmltok.c, 1.3, 1.4 xmltok_impl.c, 1.2, 1.3 expat.h.in, 1.1.1.1, NONE

fdrake at users.sourceforge.net fdrake at users.sourceforge.net
Tue Oct 21 11:38:58 EDT 2003


Update of /cvsroot/python/python/dist/src/Modules/expat
In directory sc8-pr-cvs1:/tmp/cvs-serv20685

Modified Files:
	asciitab.h expat.h iasciitab.h internal.h latin1tab.h 
	utf8tab.h winconfig.h xmlparse.c xmlrole.c xmltok.c 
	xmltok_impl.c 
Added Files:
	macconfig.h 
Removed Files:
	expat.h.in 
Log Message:
Update to Expat 1.95.7; there are no changes to the Expat sources.

--- NEW FILE: macconfig.h ---
/*================================================================
** Copyright 2000, Clark Cooper
** All rights reserved.
**
** This is free software. You are permitted to copy, distribute, or modify
** it under the terms of the MIT/X license (contained in the COPYING file
** with this distribution.)
**
*/

#ifndef MACCONFIG_H
#define MACCONFIG_H


/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
#define BYTEORDER  4321

/* Define to 1 if you have the `bcopy' function. */
#undef HAVE_BCOPY

/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H

/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE

/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H

/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE

/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H

/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP

/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H

/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H

/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H

/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H

/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H

/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

/* Define to the full name of this package. */
#undef PACKAGE_NAME

/* Define to the full name and version of this package. */
#undef PACKAGE_STRING

/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME

/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS

/* whether byteorder is bigendian */
#define WORDS_BIGENDIAN

/* Define to specify how much context to retain around the current parse
   point. */
#undef XML_CONTEXT_BYTES

/* Define to make parameter entity parsing functionality available. */
#define XML_DTD

/* Define to make XML Namespaces functionality available. */
#define XML_NS

/* Define to empty if `const' does not conform to ANSI C. */
#undef const

/* Define to `long' if <sys/types.h> does not define. */
#define off_t  long

/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t


#endif /* ifndef MACCONFIG_H */

Index: asciitab.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/asciitab.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** asciitab.h	11 Feb 2002 23:13:05 -0000	1.1.1.1
--- asciitab.h	21 Oct 2003 15:38:55 -0000	1.2
***************
*** 1,5 ****
! /*
! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
--- 1,4 ----
! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
!    See the file COPYING for copying permission.
  */
  

Index: expat.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/expat.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** expat.h	7 Feb 2003 02:15:56 -0000	1.5
--- expat.h	21 Oct 2003 15:38:55 -0000	1.6
***************
*** 17,31 ****
  #include <stdlib.h>
  
- #ifndef XMLPARSEAPI
  #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
! #ifdef XML_STATIC
! #define XMLPARSEAPI(type) type __cdecl
! #else
! #define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl
  #endif
  #else
! #define XMLPARSEAPI(type) type
  #endif
! #endif  /* not defined XMLPARSEAPI */
  
  #ifdef __cplusplus
--- 17,85 ----
  #include <stdlib.h>
  
  #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
! #define XML_USE_MSC_EXTENSIONS 1
  #endif
+ 
+ /* Expat tries very hard to make the API boundary very specifically
+    defined.  There are two macros defined to control this boundary;
+    each of these can be defined before including this header to
+    achieve some different behavior, but doing so it not recommended or
+    tested frequently.
+ 
+    XMLCALL    - The calling convention to use for all calls across the
+                 "library boundary."  This will default to cdecl, and
+                 try really hard to tell the compiler that's what we
+                 want.
+ 
+    XMLIMPORT  - Whatever magic is needed to note that a function is
+                 to be imported from a dynamically loaded library
+                 (.dll, .so, or .sl, depending on your platform).
+ 
+    The XMLCALL macro was added in Expat 1.95.7.  The only one which is
+    expected to be directly useful in client code is XMLCALL.
+ 
+    Note that on at least some Unix versions, the Expat library must be
+    compiled with the cdecl calling convention as the default since
+    system headers may assume the cdecl convention.
+ */
+ #ifndef XMLCALL
+ #if defined(XML_USE_MSC_EXTENSIONS)
+ #define XMLCALL __cdecl
+ #elif defined(__GNUC__)
+ #define XMLCALL __attribute__((cdecl))
  #else
! /* For any platform which uses this definition and supports more than
!    one calling convention, we need to extend this definition to
!    declare the convention used on that platform, if it's possible to
!    do so.
! 
!    If this is the case for your platform, please file a bug report
!    with information on how to identify your platform via the C
!    pre-processor and how to specify the same calling convention as the
!    platform's malloc() implementation.
! */
! #define XMLCALL
  #endif
! #endif  /* not defined XMLCALL */
! 
! 
! #if !defined(XML_STATIC) && !defined(XMLIMPORT)
! #ifndef XML_BUILDING_EXPAT
! /* using Expat from an application */
! 
! #ifdef XML_USE_MSC_EXTENSIONS
! #define XMLIMPORT __declspec(dllimport)
! #endif
! 
! #endif
! #endif  /* not defined XML_STATIC */
! 
! /* If we didn't define it above, define it away: */
! #ifndef XMLIMPORT
! #define XMLIMPORT
! #endif
! 
! 
! #define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
  
  #ifdef __cplusplus
***************
*** 105,109 ****
    XML_ERROR_ENTITY_DECLARED_IN_PE,
    XML_ERROR_FEATURE_REQUIRES_XML_DTD,
!   XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING
  };
  
--- 159,164 ----
    XML_ERROR_ENTITY_DECLARED_IN_PE,
    XML_ERROR_FEATURE_REQUIRES_XML_DTD,
!   XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING,
!   XML_ERROR_UNBOUND_PREFIX
  };
  
***************
*** 157,163 ****
     to free model when finished with it.
  */
! typedef void (*XML_ElementDeclHandler) (void *userData,
!                                         const XML_Char *name,
!                                         XML_Content *model);
  
  XMLPARSEAPI(void)
--- 212,218 ----
     to free model when finished with it.
  */
! typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData,
!                                                 const XML_Char *name,
!                                                 XML_Content *model);
  
  XMLPARSEAPI(void)
***************
*** 173,182 ****
     true and default is non-NULL, then this is a "#FIXED" default.
  */
! typedef void (*XML_AttlistDeclHandler) (void           *userData,
!                                         const XML_Char *elname,
!                                         const XML_Char *attname,
!                                         const XML_Char *att_type,
!                                         const XML_Char *dflt,
!                                         int             isrequired);
  
  XMLPARSEAPI(void)
--- 228,238 ----
     true and default is non-NULL, then this is a "#FIXED" default.
  */
! typedef void (XMLCALL *XML_AttlistDeclHandler) (
!                                     void            *userData,
!                                     const XML_Char  *elname,
!                                     const XML_Char  *attname,
!                                     const XML_Char  *att_type,
!                                     const XML_Char  *dflt,
!                                     int              isrequired);
  
  XMLPARSEAPI(void)
***************
*** 192,199 ****
     as no, or that it was given as yes.
  */
! typedef void (*XML_XmlDeclHandler) (void                *userData,
!                                     const XML_Char      *version,
!                                     const XML_Char      *encoding,
!                                     int                  standalone);
  
  XMLPARSEAPI(void)
--- 248,255 ----
     as no, or that it was given as yes.
  */
! typedef void (XMLCALL *XML_XmlDeclHandler) (void           *userData,
!                                             const XML_Char *version,
!                                             const XML_Char *encoding,
!                                             int             standalone);
  
  XMLPARSEAPI(void)
***************
*** 203,209 ****
  
  typedef struct {
!   void *(*malloc_fcn)(size_t size);
!   void *(*realloc_fcn)(void *ptr, size_t size);
!   void (*free_fcn)(void *ptr);
  } XML_Memory_Handling_Suite;
  
--- 259,265 ----
  
  typedef struct {
!   void *(XMLCALL *malloc_fcn)(size_t size);
!   void *(XMLCALL *realloc_fcn)(void *ptr, size_t size);
!   void (XMLCALL *free_fcn)(void *ptr);
  } XML_Memory_Handling_Suite;
  
***************
*** 258,284 ****
     names and values are 0 terminated.
  */
! typedef void (*XML_StartElementHandler)(void *userData,
!                                         const XML_Char *name,
!                                         const XML_Char **atts);
  
! typedef void (*XML_EndElementHandler)(void *userData,
!                                       const XML_Char *name);
  
  
  /* s is not 0 terminated. */
! typedef void (*XML_CharacterDataHandler)(void *userData,
!                                          const XML_Char *s,
!                                          int len);
  
  /* target and data are 0 terminated */
! typedef void (*XML_ProcessingInstructionHandler)(void *userData,
!                                                  const XML_Char *target,
!                                                  const XML_Char *data);
  
  /* data is 0 terminated */
! typedef void (*XML_CommentHandler)(void *userData, const XML_Char *data);
  
! typedef void (*XML_StartCdataSectionHandler)(void *userData);
! typedef void (*XML_EndCdataSectionHandler)(void *userData);
  
  /* This is called for any characters in the XML document for which
--- 314,342 ----
     names and values are 0 terminated.
  */
! typedef void (XMLCALL *XML_StartElementHandler) (void *userData,
!                                                  const XML_Char *name,
!                                                  const XML_Char **atts);
  
! typedef void (XMLCALL *XML_EndElementHandler) (void *userData,
!                                                const XML_Char *name);
  
  
  /* s is not 0 terminated. */
! typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData,
!                                                   const XML_Char *s,
!                                                   int len);
  
  /* target and data are 0 terminated */
! typedef void (XMLCALL *XML_ProcessingInstructionHandler) (
!                                                 void *userData,
!                                                 const XML_Char *target,
!                                                 const XML_Char *data);
  
  /* data is 0 terminated */
! typedef void (XMLCALL *XML_CommentHandler) (void *userData,
!                                             const XML_Char *data);
  
! typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData);
! typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData);
  
  /* This is called for any characters in the XML document for which
***************
*** 295,306 ****
     multiple calls.
  */
! typedef void (*XML_DefaultHandler)(void *userData,
!                                    const XML_Char *s,
!                                    int len);
  
  /* This is called for the start of the DOCTYPE declaration, before
     any DTD or internal subset is parsed.
  */
! typedef void (*XML_StartDoctypeDeclHandler)(void *userData,
                                              const XML_Char *doctypeName,
                                              const XML_Char *sysid,
--- 353,365 ----
     multiple calls.
  */
! typedef void (XMLCALL *XML_DefaultHandler) (void *userData,
!                                             const XML_Char *s,
!                                             int len);
  
  /* This is called for the start of the DOCTYPE declaration, before
     any DTD or internal subset is parsed.
  */
! typedef void (XMLCALL *XML_StartDoctypeDeclHandler) (
!                                             void *userData,
                                              const XML_Char *doctypeName,
                                              const XML_Char *sysid,
***************
*** 312,316 ****
     subset.
  */
! typedef void (*XML_EndDoctypeDeclHandler)(void *userData);
  
  /* This is called for entity declarations. The is_parameter_entity
--- 371,375 ----
     subset.
  */
! typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
  
  /* This is called for entity declarations. The is_parameter_entity
***************
*** 332,344 ****
     that would break binary compatibility.
  */
! typedef void (*XML_EntityDeclHandler) (void *userData,
!                                        const XML_Char *entityName,
!                                        int is_parameter_entity,
!                                        const XML_Char *value,
!                                        int value_length,
!                                        const XML_Char *base,
!                                        const XML_Char *systemId,
!                                        const XML_Char *publicId,
!                                        const XML_Char *notationName);
  
  XMLPARSEAPI(void)
--- 391,404 ----
     that would break binary compatibility.
  */
! typedef void (XMLCALL *XML_EntityDeclHandler) (
!                               void *userData,
!                               const XML_Char *entityName,
!                               int is_parameter_entity,
!                               const XML_Char *value,
!                               int value_length,
!                               const XML_Char *base,
!                               const XML_Char *systemId,
!                               const XML_Char *publicId,
!                               const XML_Char *notationName);
  
  XMLPARSEAPI(void)
***************
*** 355,364 ****
     NULL. The other arguments may be.
  */
! typedef void (*XML_UnparsedEntityDeclHandler)(void *userData,
!                                               const XML_Char *entityName,
!                                               const XML_Char *base,
!                                               const XML_Char *systemId,
!                                               const XML_Char *publicId,
!                                               const XML_Char *notationName);
  
  /* This is called for a declaration of notation.  The base argument is
--- 415,425 ----
     NULL. The other arguments may be.
  */
! typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) (
!                                     void *userData,
!                                     const XML_Char *entityName,
!                                     const XML_Char *base,
!                                     const XML_Char *systemId,
!                                     const XML_Char *publicId,
!                                     const XML_Char *notationName);
  
  /* This is called for a declaration of notation.  The base argument is
***************
*** 366,374 ****
     NULL.  The other arguments can be.
  */
! typedef void (*XML_NotationDeclHandler)(void *userData,
!                                         const XML_Char *notationName,
!                                         const XML_Char *base,
!                                         const XML_Char *systemId,
!                                         const XML_Char *publicId);
  
  /* When namespace processing is enabled, these are called once for
--- 427,436 ----
     NULL.  The other arguments can be.
  */
! typedef void (XMLCALL *XML_NotationDeclHandler) (
!                                     void *userData,
!                                     const XML_Char *notationName,
!                                     const XML_Char *base,
!                                     const XML_Char *systemId,
!                                     const XML_Char *publicId);
  
  /* When namespace processing is enabled, these are called once for
***************
*** 378,387 ****
     NULL.  For an xmlns="" attribute, uri will be NULL.
  */
! typedef void (*XML_StartNamespaceDeclHandler)(void *userData,
!                                               const XML_Char *prefix,
!                                               const XML_Char *uri);
  
! typedef void (*XML_EndNamespaceDeclHandler)(void *userData,
!                                             const XML_Char *prefix);
  
  /* This is called if the document is not standalone, that is, it has an
--- 440,451 ----
     NULL.  For an xmlns="" attribute, uri will be NULL.
  */
! typedef void (XMLCALL *XML_StartNamespaceDeclHandler) (
!                                     void *userData,
!                                     const XML_Char *prefix,
!                                     const XML_Char *uri);
  
! typedef void (XMLCALL *XML_EndNamespaceDeclHandler) (
!                                     void *userData,
!                                     const XML_Char *prefix);
  
  /* This is called if the document is not standalone, that is, it has an
***************
*** 394,398 ****
     entity was actually read.
  */
! typedef int (*XML_NotStandaloneHandler)(void *userData);
  
  /* This is called for a reference to an external parsed general
--- 458,462 ----
     entity was actually read.
  */
! typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData);
  
  /* This is called for a reference to an external parsed general
***************
*** 430,438 ****
     not userData.
  */
! typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser,
!                                             const XML_Char *context,
!                                             const XML_Char *base,
!                                             const XML_Char *systemId,
!                                             const XML_Char *publicId);
  
  /* This is called in two situations:
--- 494,503 ----
     not userData.
  */
! typedef int (XMLCALL *XML_ExternalEntityRefHandler) (
!                                     XML_Parser parser,
!                                     const XML_Char *context,
!                                     const XML_Char *base,
!                                     const XML_Char *systemId,
!                                     const XML_Char *publicId);
  
  /* This is called in two situations:
***************
*** 446,452 ****
           declarations or attribute values
  */
! typedef void (*XML_SkippedEntityHandler)(void *userData,
!                                          const XML_Char *entityName,
!                                          int is_parameter_entity);
  
  /* This structure is filled in by the XML_UnknownEncodingHandler to
--- 511,518 ----
           declarations or attribute values
  */
! typedef void (XMLCALL *XML_SkippedEntityHandler) (
!                                     void *userData,
!                                     const XML_Char *entityName,
!                                     int is_parameter_entity);
  
  /* This structure is filled in by the XML_UnknownEncodingHandler to
***************
*** 505,510 ****
    int map[256];
    void *data;
!   int (*convert)(void *data, const char *s);
!   void (*release)(void *data);
  } XML_Encoding;
  
--- 571,576 ----
    int map[256];
    void *data;
!   int (XMLCALL *convert)(void *data, const char *s);
!   void (XMLCALL *release)(void *data);
  } XML_Encoding;
  
***************
*** 524,530 ****
     return an XML_UNKNOWN_ENCODING error.
  */
! typedef int (*XML_UnknownEncodingHandler)(void *encodingHandlerData,
!                                           const XML_Char *name,
!                                           XML_Encoding *info);
  
  XMLPARSEAPI(void)
--- 590,597 ----
     return an XML_UNKNOWN_ENCODING error.
  */
! typedef int (XMLCALL *XML_UnknownEncodingHandler) (
!                                     void *encodingHandlerData,
!                                     const XML_Char *name,
!                                     XML_Encoding *info);
  
  XMLPARSEAPI(void)
***************
*** 814,819 ****
  /* These functions return information about the current parse
     location.  They may be called from any callback called to report
!    some parse event; in this case the location is the location of
!    the first of the sequence of characters that generated the event. 
     
     They may also be called after returning from a call to XML_Parse
--- 881,891 ----
  /* These functions return information about the current parse
     location.  They may be called from any callback called to report
!    some parse event; in this case the location is the location of the
!    first of the sequence of characters that generated the event.  When
!    called from callbacks generated by declarations in the document
!    prologue, the location identified isn't as neatly defined, but will
!    be within the relevant markup.  When called outside of the callback
!    functions, the position indicated will be just past the last parse
!    event (regardless of whether there was an associated callback).
     
     They may also be called after returning from a call to XML_Parse
***************
*** 921,925 ****
  #define XML_MAJOR_VERSION 1
  #define XML_MINOR_VERSION 95
! #define XML_MICRO_VERSION 6
  
  #ifdef __cplusplus
--- 993,997 ----
  #define XML_MAJOR_VERSION 1
  #define XML_MINOR_VERSION 95
! #define XML_MICRO_VERSION 7
  
  #ifdef __cplusplus

Index: iasciitab.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/iasciitab.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** iasciitab.h	11 Feb 2002 23:13:05 -0000	1.1.1.1
--- iasciitab.h	21 Oct 2003 15:38:55 -0000	1.2
***************
*** 1,5 ****
! /*
! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
--- 1,4 ----
! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
!    See the file COPYING for copying permission.
  */
  

Index: internal.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/internal.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** internal.h	25 Jan 2003 22:41:29 -0000	1.1
--- internal.h	21 Oct 2003 15:38:55 -0000	1.2
***************
*** 21,35 ****
  */
  
! #if defined(__GNUC__)
! /* Instability reported with egcs on a RedHat Linux 7.3.
!    Let's comment it out:
     #define FASTCALL __attribute__((stdcall, regparm(3)))
     and let's try this:
  */
  #define FASTCALL __attribute__((regparm(3)))
- #define PTRCALL
  #define PTRFASTCALL __attribute__((regparm(3)))
  
- #elif defined(WIN32)
  /* Using __fastcall seems to have an unexpected negative effect under
     MS VC++, especially for function pointers, so we won't use it for
--- 21,38 ----
  */
  
! #if defined(__GNUC__) && defined(__i386__)
! /* We'll use this version by default only where we know it helps.
! 
!    regparm() generates warnings on Solaris boxes.   See SF bug #692878.
! 
!    Instability reported with egcs on a RedHat Linux 7.3.
!    Let's comment out:
     #define FASTCALL __attribute__((stdcall, regparm(3)))
     and let's try this:
  */
  #define FASTCALL __attribute__((regparm(3)))
  #define PTRFASTCALL __attribute__((regparm(3)))
+ #endif
  
  /* Using __fastcall seems to have an unexpected negative effect under
     MS VC++, especially for function pointers, so we won't use it for
***************
*** 39,47 ****
     the compiler cannot perform stack optimizations for call clusters.
  */
- #define FASTCALL
- #define PTRCALL
- #define PTRFASTCALL
  
! #endif
  
  #ifndef FASTCALL
--- 42,47 ----
     the compiler cannot perform stack optimizations for call clusters.
  */
  
! /* Make sure all of these are defined if they aren't already. */
  
  #ifndef FASTCALL

Index: latin1tab.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/latin1tab.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** latin1tab.h	11 Feb 2002 23:13:05 -0000	1.1.1.1
--- latin1tab.h	21 Oct 2003 15:38:55 -0000	1.2
***************
*** 1,5 ****
! /*
! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
--- 1,4 ----
! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
!    See the file COPYING for copying permission.
  */
  

Index: utf8tab.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/utf8tab.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** utf8tab.h	11 Feb 2002 23:13:05 -0000	1.1.1.1
--- utf8tab.h	21 Oct 2003 15:38:55 -0000	1.2
***************
*** 1,5 ****
! /*
! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
--- 1,4 ----
! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
!    See the file COPYING for copying permission.
  */
  

Index: winconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/winconfig.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** winconfig.h	11 Feb 2002 23:13:08 -0000	1.1.1.1
--- winconfig.h	21 Oct 2003 15:38:55 -0000	1.2
***************
*** 6,11 ****
  ** it under the terms of the MIT/X license (contained in the COPYING file
  ** with this distribution.)
- **
- **
  */
  
--- 6,9 ----
***************
*** 22,27 ****
  #define XML_NS 1
  #define XML_DTD 1
- #define XML_BYTE_ORDER 12
  #define XML_CONTEXT_BYTES 1024
  
  #endif /* ndef WINCONFIG_H */
--- 20,30 ----
  #define XML_NS 1
  #define XML_DTD 1
  #define XML_CONTEXT_BYTES 1024
+ 
+ /* we will assume all Windows platforms are little endian */
+ #define BYTEORDER 1234
+ 
+ /* Windows has memmove() available. */
+ #define HAVE_MEMMOVE
  
  #endif /* ndef WINCONFIG_H */

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/xmlparse.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xmlparse.c	28 Jan 2003 06:42:40 -0000	1.5
--- xmlparse.c	21 Oct 2003 15:38:55 -0000	1.6
***************
*** 6,38 ****
  #include <string.h>                     /* memset(), memcpy() */
  
! #ifdef COMPILED_FROM_DSP
  
  #include "winconfig.h"
- #define XMLPARSEAPI(type) type __cdecl
- #include "expat.h"
- #undef XMLPARSEAPI
- 
  #elif defined(MACOS_CLASSIC)
[...1671 lines suppressed...]
--- 5649,5654 ----
      pool->blocks = (BLOCK *)
        pool->mem->realloc_fcn(pool->blocks,
!                              (offsetof(BLOCK, s)
!                               + blockSize * sizeof(XML_Char)));
      if (pool->blocks == NULL)
        return XML_FALSE;
***************
*** 5547,5551 ****
        blockSize *= 2;
      tem = (BLOCK *)pool->mem->malloc_fcn(offsetof(BLOCK, s)
! 					+ blockSize * sizeof(XML_Char));
      if (!tem)
        return XML_FALSE;
--- 5666,5670 ----
        blockSize *= 2;
      tem = (BLOCK *)pool->mem->malloc_fcn(offsetof(BLOCK, s)
!                                         + blockSize * sizeof(XML_Char));
      if (!tem)
        return XML_FALSE;

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/xmlrole.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xmlrole.c	25 Jan 2003 22:48:51 -0000	1.5
--- xmlrole.c	21 Oct 2003 15:38:55 -0000	1.6
***************
*** 8,14 ****
  #include "macconfig.h"
  #else
! /* Unused - MvL 
  #include <expat_config.h>
! */
  #endif /* ndef COMPILED_FROM_DSP */
  
--- 8,14 ----
  #include "macconfig.h"
  #else
! #ifdef HAVE_EXPAT_CONFIG_H
  #include <expat_config.h>
! #endif
  #endif /* ndef COMPILED_FROM_DSP */
  

Index: xmltok.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/xmltok.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xmltok.c	25 Jan 2003 22:41:29 -0000	1.3
--- xmltok.c	21 Oct 2003 15:38:55 -0000	1.4
***************
*** 8,14 ****
  #include "macconfig.h"
  #else
! /* Unused - MvL
  #include <expat_config.h>
! */
  #endif /* ndef COMPILED_FROM_DSP */
  
--- 8,14 ----
  #include "macconfig.h"
  #else
! #ifdef HAVE_EXPAT_CONFIG_H
  #include <expat_config.h>
! #endif
  #endif /* ndef COMPILED_FROM_DSP */
  

Index: xmltok_impl.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/expat/xmltok_impl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xmltok_impl.c	25 Jan 2003 22:41:29 -0000	1.2
--- xmltok_impl.c	21 Oct 2003 15:38:55 -0000	1.3
***************
*** 883,887 ****
  {
    if (ptr == end)
!     return XML_TOK_PARTIAL;
    switch (BYTE_TYPE(enc, ptr)) {
    CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr)
--- 883,887 ----
  {
    if (ptr == end)
!     return -XML_TOK_PERCENT;
    switch (BYTE_TYPE(enc, ptr)) {
    CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr)

--- expat.h.in DELETED ---





More information about the Python-checkins mailing list