[Python-checkins] r71659 - in python/branches/release30-maint: Modules/_ctypes/_ctypes.c Modules/_ctypes/callbacks.c Modules/_ctypes/ctypes.h Modules/_ctypes/malloc_closure.c

[thomas.heller]

Author: thomas.heller
Date: Thu Apr 16 21:12:35 2009
New Revision: 71659

Log:
Merged revisions 71656 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71656 | thomas.heller | 2009-04-16 20:37:24 +0200 (Do, 16 Apr 2009) | 14 lines
  
  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.
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Modules/_ctypes/_ctypes.c
   python/branches/release30-maint/Modules/_ctypes/callbacks.c
   python/branches/release30-maint/Modules/_ctypes/ctypes.h
   python/branches/release30-maint/Modules/_ctypes/malloc_closure.c

Modified: python/branches/release30-maint/Modules/_ctypes/_ctypes.c
==============================================================================
--- python/branches/release30-maint/Modules/_ctypes/_ctypes.c	(original)
+++ python/branches/release30-maint/Modules/_ctypes/_ctypes.c	Thu Apr 16 21:12:35 2009
@@ -5411,11 +5411,6 @@
 		Py_INCREF(PyExc_ArgError);
 		PyModule_AddObject(m, "ArgumentError", PyExc_ArgError);
 	}
-	/*************************************************
-	 *
-	 * Others...
-	 */
-	init_callbacks_in_module(m);
 	return m;
 }
 

Modified: python/branches/release30-maint/Modules/_ctypes/callbacks.c
==============================================================================
--- python/branches/release30-maint/Modules/_ctypes/callbacks.c	(original)
+++ python/branches/release30-maint/Modules/_ctypes/callbacks.c	Thu Apr 16 21:12:35 2009
@@ -463,17 +463,6 @@
 	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)

Modified: python/branches/release30-maint/Modules/_ctypes/ctypes.h
==============================================================================
--- python/branches/release30-maint/Modules/_ctypes/ctypes.h	(original)
+++ python/branches/release30-maint/Modules/_ctypes/ctypes.h	Thu Apr 16 21:12:35 2009
@@ -148,8 +148,6 @@
 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 @@
 };
 
 extern PyTypeObject PyCArg_Type;
-extern PyCArgObject *new_CArgObject(void);
 #define PyCArg_CheckExact(v)	    ((v)->ob_type == &PyCArg_Type)
 extern PyCArgObject *new_CArgObject(void);
 

Modified: python/branches/release30-maint/Modules/_ctypes/malloc_closure.c
==============================================================================
--- python/branches/release30-maint/Modules/_ctypes/malloc_closure.c	(original)
+++ python/branches/release30-maint/Modules/_ctypes/malloc_closure.c	Thu Apr 16 21:12:35 2009
@@ -28,7 +28,7 @@
 } ITEM;
 
 static ITEM *free_list;
-int _pagesize;
+static int _pagesize;
 
 static void more_core(void)
 {