Merged revisions 71640-71641 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71640 | thomas.heller | 2009-04-16 08:26:33 +0200 (Do, 16 Apr 2009) | 1 line

  Remove unneeded code.
........
  r71641 | thomas.heller | 2009-04-16 08:42:02 +0200 (Do, 16 Apr 2009) | 2 lines

  Remove duplicated function declaration.
  Make _pagesize static.
........

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 61d34ab1c3ced1a72669a874bbfbdfea3a5bfa9a..69a8c731b0fd07c9929ca17ab9c3767820dc09f2 100644 (file)
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -5411,11 +5411,6 @@ PyInit__ctypes(void)
                Py_INCREF(PyExc_ArgError);
                PyModule_AddObject(m, "ArgumentError", PyExc_ArgError);
        }
-       /*************************************************
-        *
-        * Others...
-        */
-       init_callbacks_in_module(m);
        return m;
 }
 

diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index ed86ee503fa3094c8f9028e565a43a16845ef926..b5993260402e4ac5741108c61949aa3d64ba3036 100644 (file)
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -463,17 +463,6 @@ CThunkObject *AllocFunctionCallback(PyObject *callable,
        return NULL;
 }
 
-/****************************************************************************
- *
- * callback objects: initialization
- */
-
-void init_callbacks_in_module(PyObject *m)
-{
-       if (PyType_Ready((PyTypeObject *)&PyType_Type) < 0)
-               return;
-}
-
 #ifdef MS_WIN32
 
 static void LoadPython(void)

diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h
index 7bbe439bf854fec674468467e448d6307ef760fb..acd94f4b3cd84de88515a627c4609f4f53c8550a 100644 (file)
--- a/Modules/_ctypes/ctypes.h
+++ b/Modules/_ctypes/ctypes.h
@@ -148,8 +148,6 @@ extern PyTypeObject StructType_Type;
 extern PyObject *
 CreateArrayType(PyObject *itemtype, Py_ssize_t length);
 
-extern void init_callbacks_in_module(PyObject *m);
-
 extern PyMethodDef module_methods[];
 
 extern CThunkObject *AllocFunctionCallback(PyObject *callable,
@@ -312,7 +310,6 @@ struct tagPyCArgObject {
 };
 
 extern PyTypeObject PyCArg_Type;
-extern PyCArgObject *new_CArgObject(void);
 #define PyCArg_CheckExact(v)       ((v)->ob_type == &PyCArg_Type)
 extern PyCArgObject *new_CArgObject(void);
 

diff --git a/Modules/_ctypes/malloc_closure.c b/Modules/_ctypes/malloc_closure.c
index b7d58c00bd7fb5f8aee2f3948331027f0ad31d53..97d4d4ed939bb44d08b4f7c5cf9f78b638617f32 100644 (file)
--- a/Modules/_ctypes/malloc_closure.c
+++ b/Modules/_ctypes/malloc_closure.c
@@ -28,7 +28,7 @@ typedef union _tagITEM {
 } ITEM;
 
 static ITEM *free_list;
-int _pagesize;
+static int _pagesize;
 
 static void more_core(void)
 {