[Zope-Checkins] CVS: Zope2 - BTreeModuleTemplate.c:1.4.2.4

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/tmp/cvs-serv25595

Modified Files:
      Tag: Catalog-BTrees-Integration
	BTreeModuleTemplate.c 
Log Message:
Added logic for merging conflicting changes.



--- Updated File BTreeModuleTemplate.c in package Zope2 --
--- BTreeModuleTemplate.c	2001/03/04 18:57:39	1.4.2.3
+++ BTreeModuleTemplate.c	2001/03/12 16:25:12	1.4.2.4
@@ -113,7 +113,7 @@
 #define PER_CHANGED(O) 0
 #endif
 
-PyObject *sort_str, *reverse_str, *items_str;
+static PyObject *sort_str, *reverse_str, *items_str, *__setstate___str;
 
 static void PyVar_Assign(PyObject **v, PyObject *e) { Py_XDECREF(*v); *v=e;}
 #define ASSIGN(V,E) PyVar_Assign(&(V),(E))
@@ -299,6 +299,7 @@
 #include "BTreeTemplate.c"
 #include "TreeSetTemplate.c"
 #include "SetOpTemplate.c"
+#include "MergeTemplate.c"
 
 static struct PyMethodDef module_methods[] = {
   {"difference", (PyCFunction) difference_m,	METH_VARARGS,
@@ -334,6 +335,7 @@
   UNLESS (sort_str=PyString_FromString("sort")) return;
   UNLESS (reverse_str=PyString_FromString("reverse")) return;
   UNLESS (items_str=PyString_FromString("items")) return;
+  UNLESS (__setstate___str=PyString_FromString("__setstate__")) return;
 
   UNLESS (PyExtensionClassCAPI=PyCObject_Import("ExtensionClass","CAPI"))
       return;