[Zope-Checkins] CVS: Zope3/lib/python/Zope/ContextWrapper - wrapper.c:1.12.2.2

[Fred Drake Jr]

Update of /cvs-repository/Zope3/lib/python/Zope/ContextWrapper
In directory cvs.zope.org:/tmp/cvs-serv2716

Modified Files:
      Tag: Zope-3x-branch
	wrapper.c 
Log Message:
Change the names of the Python-visible functions (in C) to avoid conflicts
with symbols defined in the standard headers on at least some versions of
Linux.


=== Zope3/lib/python/Zope/ContextWrapper/wrapper.c 1.12.2.1 => 1.12.2.2 ===
 
 static PyObject *
-getobject(PyObject *unused, PyObject *obj)
+wrapper_getobject(PyObject *unused, PyObject *obj)
 {
     PyObject *result = NULL;
 
@@ -527,7 +527,7 @@
 "wrapper at all.";
 
 static PyObject *
-getinnerobject(PyObject *unused, PyObject *obj)
+wrapper_getinnerobject(PyObject *unused, PyObject *obj)
 {
     obj = api_getinnerobject(obj);
     if (obj == NULL)
@@ -543,7 +543,7 @@
 "Return the context object for wrapper, or None if there isn't one.";
 
 static PyObject *
-getcontext(PyObject *unused, PyObject *obj)
+wrapper_getcontext(PyObject *unused, PyObject *obj)
 {
     PyObject *result = NULL;
 
@@ -568,7 +568,7 @@
 "'wrapper' isn't a wrapper at all.";
 
 static PyObject *
-getinnercontext(PyObject *unused, PyObject *obj)
+wrapper_getinnercontext(PyObject *unused, PyObject *obj)
 {
     PyObject *result = api_getinnercontext(obj);
     if (result == NULL)
@@ -584,7 +584,7 @@
 "Return the context dictionary for wrapper, or None if it does not exist.\n";
 
 static PyObject *
-getdict(PyObject *unused, PyObject *obj)
+wrapper_getdict(PyObject *unused, PyObject *obj)
 {
     PyObject *result = NULL;
 
@@ -607,7 +607,7 @@
 "exist.";
 
 static PyObject *
-getdictcreate(PyObject *unused, PyObject *obj)
+wrapper_getdictcreate(PyObject *unused, PyObject *obj)
 {
     PyObject *result = NULL;
 
@@ -629,7 +629,7 @@
 "Replaced the wrapped object with object.";
 
 static PyObject *
-setobject(PyObject *unused, PyObject *args)
+wrapper_setobject(PyObject *unused, PyObject *args)
 {
     PyObject *wrapper;
     PyObject *object;
@@ -651,7 +651,7 @@
 "Replace the context object for wrapper with context.";
 
 static PyObject *
-setcontext(PyObject *unused, PyObject *args)
+wrapper_setcontext(PyObject *unused, PyObject *args)
 {
     PyObject *wrapper;
     PyObject *context = NULL;
@@ -668,14 +668,22 @@
 
 static PyMethodDef
 module_functions[] = {
-    {"getobject",       getobject,       METH_O,       getobject__doc__},
-    {"getinnerobject",  getinnerobject,  METH_O,       getinnerobject__doc__},
-    {"getcontext",      getcontext,      METH_O,       getcontext__doc__},
-    {"getinnercontext", getinnercontext, METH_O,       getinnercontext__doc__},
-    {"getdict",         getdict,         METH_O,       getdict__doc__},
-    {"getdictcreate",   getdictcreate,   METH_O,       getdictcreate__doc__},
-    {"setobject",       setobject,       METH_VARARGS, setobject__doc__},
-    {"setcontext",      setcontext,      METH_VARARGS, setcontext__doc__},
+    {"getobject",       wrapper_getobject,       METH_O,
+     getobject__doc__},
+    {"getinnerobject",  wrapper_getinnerobject,  METH_O,
+     getinnerobject__doc__},
+    {"getcontext",      wrapper_getcontext,      METH_O,
+     getcontext__doc__},
+    {"getinnercontext", wrapper_getinnercontext, METH_O,
+     getinnercontext__doc__},
+    {"getdict",         wrapper_getdict,         METH_O,
+     getdict__doc__},
+    {"getdictcreate",   wrapper_getdictcreate,   METH_O,
+     getdictcreate__doc__},
+    {"setobject",       wrapper_setobject,       METH_VARARGS,
+     setobject__doc__},
+    {"setcontext",      wrapper_setcontext,      METH_VARARGS,
+     setcontext__doc__},
     {NULL, NULL, 0, NULL}
 };