summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorSkip Montanaro <skip@pobox.com>2006-04-18 00:55:46 (GMT)
committerSkip Montanaro <skip@pobox.com>2006-04-18 00:55:46 (GMT)
commit53a6d1de831a4d25cebf7b957b52c42d1e9e8bdb (patch)
tree5b1d63d76d6bf3d75ffeb4d83a5826912b876816 /Python
parent7ff54e7706032f0e2559e12c7217b528714eef0f (diff)
downloadcpython-53a6d1de831a4d25cebf7b957b52c42d1e9e8bdb.zip
cpython-53a6d1de831a4d25cebf7b957b52c42d1e9e8bdb.tar.gz
cpython-53a6d1de831a4d25cebf7b957b52c42d1e9e8bdb.tar.bz2
C++ compiler cleanup: extern "C" a couple declarations, cast int to size_t
Diffstat (limited to 'Python')
-rw-r--r--Python/sysmodule.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index cbf0d8f..8612c24 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -700,6 +700,10 @@ a 11-tuple where the entries in the tuple are counts of:\n\
10. Number of stack pops performed by call_function()"
);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifdef Py_TRACE_REFS
/* Defined in objects.c because it uses static globals if that file */
extern PyObject *_Py_GetObjects(PyObject *, PyObject *);
@@ -710,6 +714,10 @@ extern PyObject *_Py_GetObjects(PyObject *, PyObject *);
extern PyObject *_Py_GetDXProfile(PyObject *, PyObject *);
#endif
+#ifdef __cplusplus
+}
+#endif
+
static PyMethodDef sys_methods[] = {
/* Might as well keep this in alphabetic order */
{"callstats", (PyCFunction)PyEval_GetCallStats, METH_NOARGS,
@@ -1414,7 +1422,7 @@ mywrite(char *name, FILE *fp, const char *format, va_list va)
PyErr_Clear();
fputs(buffer, fp);
}
- if (written < 0 || written >= sizeof(buffer)) {
+ if (written < 0 || (size_t)written >= sizeof(buffer)) {
const char *truncated = "... truncated";
if (PyFile_WriteString(truncated, file) != 0) {
PyErr_Clear();