[Zope-Checkins] CVS: Zope/lib/python/BTrees - BTreeTemplate.c:1.71.8.4 BucketTemplate.c:1.47.8.4 SetTemplate.c:1.15.66.4 TreeSetTemplate.c:1.14.8.4 _fsBTree.c:1.4.8.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/BTrees
In directory cvs.zope.org:/tmp/cvs-serv7742

Modified Files:
      Tag: chrism-install-branch
	BTreeTemplate.c BucketTemplate.c SetTemplate.c 
	TreeSetTemplate.c _fsBTree.c 
Log Message:
Merge with HEAD.


=== Zope/lib/python/BTrees/BTreeTemplate.c 1.71.8.3 => 1.71.8.4 ===


=== Zope/lib/python/BTrees/BucketTemplate.c 1.47.8.3 => 1.47.8.4 ===
--- Zope/lib/python/BTrees/BucketTemplate.c:1.47.8.3	Sat Oct 26 15:51:37 2002
+++ Zope/lib/python/BTrees/BucketTemplate.c	Sun Nov 24 18:32:39 2002
@@ -175,6 +175,13 @@
   return -1;
 }
 
+/* So far, bucket_append is called only by multiunion_m(), so is called
+ * only when MULTI_INT_UNION is defined.  Flavors of BTree/Bucket that
+ * don't support MULTI_INT_UNION don't call bucket_append (yet), and
+ * gcc complains if bucket_append is compiled in those cases.  So only
+ * compile bucket_append if it's going to be used.
+ */
+#ifdef MULTI_INT_UNION
 /*
  * Append a slice of the "from" bucket to self.
  *
@@ -261,7 +268,7 @@
 #endif
     return 0;
 }
-
+#endif /* MULTI_INT_UNION */
 
 /*
 ** _bucket_set: Assign a value to a key in a bucket, delete a key+value


=== Zope/lib/python/BTrees/SetTemplate.c 1.15.66.3 => 1.15.66.4 ===


=== Zope/lib/python/BTrees/TreeSetTemplate.c 1.14.8.3 => 1.14.8.4 ===


=== Zope/lib/python/BTrees/_fsBTree.c 1.4 => 1.4.8.1 ===
--- Zope/lib/python/BTrees/_fsBTree.c:1.4	Wed Jun 26 20:32:54 2002
+++ Zope/lib/python/BTrees/_fsBTree.c	Sun Nov 24 18:32:39 2002
@@ -7,8 +7,6 @@
    positions.
 */
 
-#include <string.h>
-
 typedef unsigned char char2[2];
 typedef unsigned char char6[6];