Merged revisions 71640-71641 via svnmerge from

Thomas Heller · Thomas Heller · commit 579b65c2d695 · 2009-04-16T18:37:24.000Z
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
@@ -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
@@ -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
@@ -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
@@ -28,7 +28,7 @@ typedef union _tagITEM {
 } ITEM;
 
 static ITEM *free_list;
-int _pagesize;
+static int _pagesize;
 
 static void more_core(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -5411,11 +5411,6 @@ PyInit__ctypes(void)`
`5411`	`5411`	`Py_INCREF(PyExc_ArgError);`
`5412`	`5412`	`PyModule_AddObject(m, "ArgumentError", PyExc_ArgError);`
`5413`	`5413`	`}`
`5414`		`- /*************************************************`
`5415`		`- *`
`5416`		`- * Others...`
`5417`		`- */`
`5418`		`- init_callbacks_in_module(m);`
`5419`	`5414`	`return m;`
`5420`	`5415`	`}`
`5421`	`5416`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ typedef union _tagITEM {`
`28`	`28`	`} ITEM;`
`29`	`29`
`30`	`30`	`static ITEM *free_list;`
`31`		`-int _pagesize;`
	`31`	`+static int _pagesize;`
`32`	`32`
`33`	`33`	`static void more_core(void)`
`34`	`34`	`{`