Mailing List Archive

python/dist/src/Modules pyexpat.c,2.65,2.66
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv10196

Modified Files:
pyexpat.c
Log Message:
Bring this back into sync with PyXML revision 1.58.


Index: pyexpat.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pyexpat.c,v
retrieving revision 2.65
retrieving revision 2.66
diff -C2 -d -r2.65 -r2.66
*** pyexpat.c 30 Jun 2002 06:40:55 -0000 2.65
--- pyexpat.c 1 Jul 2002 14:02:31 -0000 2.66
***************
*** 2,5 ****
--- 2,9 ----
#include <ctype.h>

+ #ifdef HAVE_PYMEMCOMPAT_H
+ #include "pymemcompat.h"
+ #endif
+
#include "compile.h"
#include "frameobject.h"
***************
*** 7,10 ****
--- 11,16 ----

#ifndef PyDoc_STRVAR
+ #define PyDoc_STR(str) (str)
+ #define PyDoc_VAR(name) static char name[]
#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
#endif
***************
*** 1161,1165 ****
XML_SetUserData(self->itself, (void *)self);
#ifdef Py_USING_UNICODE
! XML_SetUnknownEncodingHandler(self->itself, (XML_UnknownEncodingHandler) PyUnknownEncodingHandler, NULL);
#endif

--- 1167,1172 ----
XML_SetUserData(self->itself, (void *)self);
#ifdef Py_USING_UNICODE
! XML_SetUnknownEncodingHandler(self->itself,
! (XML_UnknownEncodingHandler) PyUnknownEncodingHandler, NULL);
#endif

***************
*** 1167,1172 ****
/* do nothing */;

! self->handlers = malloc(sizeof(PyObject *)*i);
! if (!self->handlers){
Py_DECREF(self);
return PyErr_NoMemory();
--- 1174,1179 ----
/* do nothing */;

! self->handlers = malloc(sizeof(PyObject *) * i);
! if (!self->handlers) {
Py_DECREF(self);
return PyErr_NoMemory();