From 33fcecac4b0cd07a492793fb87c10b46507576f6 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 16 Apr 2009 19:13:35 +0000
Subject: 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.
........
---
 Modules/_ctypes/_ctypes.c        |  5 -----
 Modules/_ctypes/callbacks.c      | 11 -----------
 Modules/_ctypes/ctypes.h         |  3 ---
 Modules/_ctypes/malloc_closure.c |  2 +-
 4 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 360046b..43da209 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -5606,11 +5606,6 @@ init_ctypes(void)
 		Py_INCREF(PyExc_ArgError);
 		PyModule_AddObject(m, "ArgumentError", PyExc_ArgError);
 	}
-	/*************************************************
-	 *
-	 * Others...
-	 */
-	init_callbacks_in_module(m);
 }
 
 /*****************************************************************
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index 0f8c8fa..ea43c68 100644
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -466,17 +466,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 cce733b..6de9a81 100644
--- a/Modules/_ctypes/ctypes.h
+++ b/Modules/_ctypes/ctypes.h
@@ -189,8 +189,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,
@@ -353,7 +351,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 73fc0d9..105935e 100644
--- a/Modules/_ctypes/malloc_closure.c
+++ b/Modules/_ctypes/malloc_closure.c
@@ -32,7 +32,7 @@ typedef union _tagITEM {
 } ITEM;
 
 static ITEM *free_list;
-int _pagesize;
+static int _pagesize;
 
 static void more_core(void)
 {
-- 
cgit v0.12