mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge from 3.2 (#10318, #12255, #12043, #12417 and other fixes)

Browse source
This commit is contained in:
Éric Araujo 2011-07-29 03:11:09 +02:00
commit 2527796a22
33 changed files with 81 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/marshal.c
View file

@ -57,7 +57,7 @@ typedef struct {
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 @@ typedef WFILE RFILE; /* Same struct with different invariants */
static int
r_string(char *s, int n, RFILE *p)
{
char * ptr;
char *ptr;
int read, left;
if (!p->readable) {
@ -566,7 +566,7 @@ r_long(RFILE *p)
static PyObject *
r_long64(RFILE *p)
{
PyObject * result = NULL;
PyObject *result = NULL;
long lo4 = r_long(p);
long hi4 = r_long(p);