Mercurial > cpython-lru_cache-weakref
diff Python/marshal.c @ 71570:5467abaaf5eb
Merge from 3.2 (#10318, #12255, #12043, #12417 and other fixes)
| author | Éric Araujo <merwok@netwok.org> |
|---|---|
| date | Fri, 29 Jul 2011 03:11:09 +0200 |
| parents | 42193f3ffc94 9e293f617544 |
| children | 8beaa9a37387 |
line wrap: on
line diff
--- a/Python/marshal.c Thu Jul 28 23:35:29 2011 +0200 +++ b/Python/marshal.c Fri Jul 29 03:11:09 2011 +0200 @@ -57,7 +57,7 @@ int error; /* see WFERR_* values */ int depth; /* If fp == NULL, the following are valid: */ - PyObject * readable; /* Stream-like object being read from */ + PyObject *readable; /* Stream-like object being read from */ PyObject *str; PyObject *current_filename; char *ptr; @@ -467,7 +467,7 @@ static int r_string(char *s, int n, RFILE *p) { - char * ptr; + char *ptr; int read, left; if (!p->readable) { @@ -566,7 +566,7 @@ static PyObject * r_long64(RFILE *p) { - PyObject * result = NULL; + PyObject *result = NULL; long lo4 = r_long(p); long hi4 = r_long(p);