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

Issue #15466: Stop using TYPE_INT64 in marshal,

Browse source 
to make importlib.h (and other byte code files) equal between 32-bit
and 64-bit systems.
This commit is contained in:
Martin v. Löwis 2012-07-28 19:44:05 +02:00
parent 5562d9dc5d
commit 7e39572aa8
3 changed files with 2357 additions and 2360 deletions
Download patch file Download diff file Expand all files Collapse all files

4698
Python/importlib.h
View file

File diff suppressed because it is too large Load diff

16
Python/marshal.c
View file

@ -31,6 +31,9 @@
#define TYPE_STOPITER 'S'
#define TYPE_ELLIPSIS '.'
#define TYPE_INT 'i'
/* TYPE_INT64 is deprecated. It is not
generated anymore, and support for reading it
will be removed in Python 3.4. */
#define TYPE_INT64 'I'
#define TYPE_FLOAT 'f'
#define TYPE_BINARY_FLOAT 'g'
@ -121,15 +124,6 @@ w_long(long x, WFILE *p)
w_byte((char)((x>>24) & 0xff), p);
}
#if SIZEOF_LONG > 4
static void
w_long64(long x, WFILE *p)
{
w_long(x, p);
w_long(x>>32, p);
}
#endif
/* We assume that Python longs are stored internally in base some power of
2**15; for the sake of portability we'll always read and write them in base
exactly 2**15. */
@ -219,8 +213,8 @@ w_object(PyObject *v, WFILE *p)
#if SIZEOF_LONG > 4
long y = Py_ARITHMETIC_RIGHT_SHIFT(long, x, 31);
if (y && y != -1) {
w_byte(TYPE_INT64, p);
w_long64(x, p);
/* Too large for TYPE_INT */
w_PyLong((PyLongObject*)v, p);
}
else
#endif