[Zope-Checkins] CVS: Zope2 - BTreeItemsTemplate.c:1.3.6.2 BTreeModuleTemplate.c:1.4.6.2 BTreeTemplate.c:1.9.6.2 BucketTemplate.c:1.6.6.2 IIBTree.c:1.6.6.2 IOBTree.c:1.6.6.2 OIBTree.c:1.5.6.2 OOBTree.c:1.5.6.2 SetTemplate.c:1.6.6.2 TreeSetTemplate.c:1.5.6.2

Brian Lloyd brian@digiciool.com
Thu, 15 Mar 2001 12:28:33 -0500 (EST)


Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/home/brian/temp/mainline_test/lib/python/BTrees

Modified Files:
      Tag: zope-2_3-branch
	BTreeItemsTemplate.c BTreeModuleTemplate.c BTreeTemplate.c 
	BucketTemplate.c IIBTree.c IOBTree.c OIBTree.c OOBTree.c 
	SetTemplate.c TreeSetTemplate.c 
Log Message:
changed PREFIX to MOD_NAME_PREFIX to avoid hosing windows builds 
(MSVC defines PREFIX)



--- Updated File BTreeItemsTemplate.c in package Zope2 --
--- BTreeItemsTemplate.c	2001/03/15 13:10:28	1.3.6.1
+++ BTreeItemsTemplate.c	2001/03/15 17:28:32	1.3.6.2
@@ -452,7 +452,7 @@
 static PyTypeObject BTreeItemsType = {
   PyObject_HEAD_INIT(NULL)
   0,					/*ob_size*/
-  PREFIX "BTreeItems",	        /*tp_name*/
+  MOD_NAME_PREFIX "BTreeItems",	        /*tp_name*/
   sizeof(BTreeItems),		        /*tp_basicsize*/
   0,					/*tp_itemsize*/
   /* methods */

--- Updated File BTreeModuleTemplate.c in package Zope2 --
--- BTreeModuleTemplate.c	2001/03/15 13:10:28	1.4.6.1
+++ BTreeModuleTemplate.c	2001/03/15 17:28:32	1.4.6.2
@@ -379,7 +379,7 @@
 #endif
 
   /* Create the module and add the functions */
-  m = Py_InitModule4(PREFIX "BTree", module_methods,
+  m = Py_InitModule4(MOD_NAME_PREFIX "BTree", module_methods,
 		     BTree_module_documentation,
 		     (PyObject*)NULL,PYTHON_API_VERSION);
 
@@ -389,12 +389,12 @@
   PyDict_SetItemString(d, "__version__",
 		       PyString_FromString("$Revision$"));
 
-  PyExtensionClass_Export(d,PREFIX "Bucket", BucketType);
-  PyExtensionClass_Export(d,PREFIX "BTree", BTreeType);
-  PyExtensionClass_Export(d,PREFIX "Set", SetType);
-  PyExtensionClass_Export(d,PREFIX "TreeSet", TreeSetType);
+  PyExtensionClass_Export(d,MOD_NAME_PREFIX "Bucket", BucketType);
+  PyExtensionClass_Export(d,MOD_NAME_PREFIX "BTree", BTreeType);
+  PyExtensionClass_Export(d,MOD_NAME_PREFIX "Set", SetType);
+  PyExtensionClass_Export(d,MOD_NAME_PREFIX "TreeSet", TreeSetType);
  
   /* Check for errors */
   if (PyErr_Occurred())
-    Py_FatalError("can't initialize module " PREFIX "BTree");
+    Py_FatalError("can't initialize module " MOD_NAME_PREFIX "BTree");
 }

--- Updated File BTreeTemplate.c in package Zope2 --
--- BTreeTemplate.c	2001/03/15 13:10:28	1.9.6.1
+++ BTreeTemplate.c	2001/03/15 17:28:32	1.9.6.2
@@ -1304,7 +1304,7 @@
 static PyExtensionClass BTreeType = {
   PyObject_HEAD_INIT(NULL)
   0,				/*ob_size*/
-  PREFIX "BTree",			/*tp_name*/
+  MOD_NAME_PREFIX "BTree",			/*tp_name*/
   sizeof(BTree),		/*tp_basicsize*/
   0,				/*tp_itemsize*/
   /************* methods ********************/

--- Updated File BucketTemplate.c in package Zope2 --
--- BucketTemplate.c	2001/03/15 13:10:28	1.6.6.1
+++ BucketTemplate.c	2001/03/15 17:28:32	1.6.6.2
@@ -1175,7 +1175,7 @@
   static PyObject *format;
   PyObject *r, *t;
 
-  UNLESS (format) UNLESS (format=PyString_FromString(PREFIX "Bucket(%s)")) 
+  UNLESS (format) UNLESS (format=PyString_FromString(MOD_NAME_PREFIX "Bucket(%s)")) 
     return NULL;
   UNLESS (t=PyTuple_New(1)) return NULL;
   UNLESS (r=bucket_items(self,NULL)) goto err;
@@ -1191,7 +1191,7 @@
 static PyExtensionClass BucketType = {
   PyObject_HEAD_INIT(NULL)
   0,				/*ob_size*/
-  PREFIX "Bucket",			/*tp_name*/
+  MOD_NAME_PREFIX "Bucket",			/*tp_name*/
   sizeof(Bucket),		/*tp_basicsize*/
   0,				/*tp_itemsize*/
   /*********** methods ***********************/

--- Updated File IIBTree.c in package Zope2 --
--- IIBTree.c	2001/03/15 13:10:28	1.6.6.1
+++ IIBTree.c	2001/03/15 17:28:32	1.6.6.2
@@ -2,7 +2,7 @@
 
 #define PERSISTENT
 
-#define PREFIX "II"
+#define MOD_NAME_PREFIX "II"
 #define INITMODULE initIIBTree
 #define DEFAULT_MAX_BUCKET_SIZE 120
 #define DEFAULT_MAX_BTREE_SIZE 500

--- Updated File IOBTree.c in package Zope2 --
--- IOBTree.c	2001/03/15 13:10:28	1.6.6.1
+++ IOBTree.c	2001/03/15 17:28:32	1.6.6.2
@@ -1,7 +1,7 @@
 
 #define PERSISTENT
 
-#define PREFIX "IO"
+#define MOD_NAME_PREFIX "IO"
 #define DEFAULT_MAX_BUCKET_SIZE 60
 #define DEFAULT_MAX_BTREE_SIZE 500
 #define INITMODULE initIOBTree

--- Updated File OIBTree.c in package Zope2 --
--- OIBTree.c	2001/03/15 13:10:28	1.5.6.1
+++ OIBTree.c	2001/03/15 17:28:32	1.5.6.2
@@ -1,7 +1,7 @@
 
 #define PERSISTENT
 
-#define PREFIX "OI"
+#define MOD_NAME_PREFIX "OI"
 #define INITMODULE initOIBTree
 #define DEFAULT_MAX_BUCKET_SIZE 60
 #define DEFAULT_MAX_BTREE_SIZE 250

--- Updated File OOBTree.c in package Zope2 --
--- OOBTree.c	2001/03/15 13:10:28	1.5.6.1
+++ OOBTree.c	2001/03/15 17:28:32	1.5.6.2
@@ -1,7 +1,7 @@
 
 #define PERSISTENT
 
-#define PREFIX "OO"
+#define MOD_NAME_PREFIX "OO"
 #define INITMODULE initOOBTree
 #define DEFAULT_MAX_BUCKET_SIZE 30
 #define DEFAULT_MAX_BTREE_SIZE 250

--- Updated File SetTemplate.c in package Zope2 --
--- SetTemplate.c	2001/03/15 13:10:28	1.6.6.1
+++ SetTemplate.c	2001/03/15 17:28:32	1.6.6.2
@@ -250,7 +250,7 @@
   static PyObject *format;
   PyObject *r, *t;
 
-  UNLESS (format) UNLESS (format=PyString_FromString(PREFIX "Set(%s)")) 
+  UNLESS (format) UNLESS (format=PyString_FromString(MOD_NAME_PREFIX "Set(%s)")) 
     return NULL;
   UNLESS (t=PyTuple_New(1)) return NULL;
   UNLESS (r=bucket_keys(self,NULL)) goto err;
@@ -306,7 +306,7 @@
 static PyExtensionClass SetType = {
   PyObject_HEAD_INIT(NULL)
   0,				/*ob_size*/
-  PREFIX "Set",			/*tp_name*/
+  MOD_NAME_PREFIX "Set",			/*tp_name*/
   sizeof(Bucket),		/*tp_basicsize*/
   0,				/*tp_itemsize*/
   /*********** methods ***********************/

--- Updated File TreeSetTemplate.c in package Zope2 --
--- TreeSetTemplate.c	2001/03/15 13:10:28	1.5.6.1
+++ TreeSetTemplate.c	2001/03/15 17:28:32	1.5.6.2
@@ -194,7 +194,7 @@
 static PyExtensionClass TreeSetType = {
   PyObject_HEAD_INIT(NULL)
   0,				/*ob_size*/
-  PREFIX "TreeSet",		/*tp_name*/
+  MOD_NAME_PREFIX "TreeSet",		/*tp_name*/
   sizeof(BTree),		/*tp_basicsize*/
   0,				/*tp_itemsize*/
   /************* methods ********************/