[Python-checkins] r71660 - in python/branches/release26-maint: Modules/_ctypes/_ctypes.c Modules/_ctypes/callbacks.c Modules/_ctypes/ctypes.h Modules/_ctypes/malloc_closure.c
thomas.heller
python-checkins at python.org
Thu Apr 16 21:13:35 CEST 2009
Author: thomas.heller
Date: Thu Apr 16 21:13:35 2009
New Revision: 71660
Log:
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/release26-maint/ (props changed)
python/branches/release26-maint/Modules/_ctypes/_ctypes.c
python/branches/release26-maint/Modules/_ctypes/callbacks.c
python/branches/release26-maint/Modules/_ctypes/ctypes.h
python/branches/release26-maint/Modules/_ctypes/malloc_closure.c
Modified: python/branches/release26-maint/Modules/_ctypes/_ctypes.c
==============================================================================
--- python/branches/release26-maint/Modules/_ctypes/_ctypes.c (original)
+++ python/branches/release26-maint/Modules/_ctypes/_ctypes.c Thu Apr 16 21:13:35 2009
@@ -5606,11 +5606,6 @@
Py_INCREF(PyExc_ArgError);
PyModule_AddObject(m, "ArgumentError", PyExc_ArgError);
}
- /*************************************************
- *
- * Others...
- */
- init_callbacks_in_module(m);
}
/*****************************************************************
Modified: python/branches/release26-maint/Modules/_ctypes/callbacks.c
==============================================================================
--- python/branches/release26-maint/Modules/_ctypes/callbacks.c (original)
+++ python/branches/release26-maint/Modules/_ctypes/callbacks.c Thu Apr 16 21:13:35 2009
@@ -466,17 +466,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/release26-maint/Modules/_ctypes/ctypes.h
==============================================================================
--- python/branches/release26-maint/Modules/_ctypes/ctypes.h (original)
+++ python/branches/release26-maint/Modules/_ctypes/ctypes.h Thu Apr 16 21:13:35 2009
@@ -189,8 +189,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,
@@ -353,7 +351,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/release26-maint/Modules/_ctypes/malloc_closure.c
==============================================================================
--- python/branches/release26-maint/Modules/_ctypes/malloc_closure.c (original)
+++ python/branches/release26-maint/Modules/_ctypes/malloc_closure.c Thu Apr 16 21:13:35 2009
@@ -32,7 +32,7 @@
} ITEM;
static ITEM *free_list;
-int _pagesize;
+static int _pagesize;
static void more_core(void)
{
More information about the Python-checkins
mailing list