mirror of
https://github.com/python/cpython.git
synced 2025-11-01 02:38:53 +00:00
Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
This commit is contained in:
parent
17b8e97e2e
commit
67387fb4aa
3 changed files with 4 additions and 2 deletions
|
|
@ -849,7 +849,7 @@ bu_longlong(const char *p, const formatdef *f)
|
|||
} while (--i > 0);
|
||||
/* Extend the sign bit. */
|
||||
if (SIZEOF_LONG_LONG > f->size)
|
||||
x |= -(x & (1L << ((8 * f->size) - 1)));
|
||||
x |= -(x & ((PY_LONG_LONG)1 << ((8 * f->size) - 1)));
|
||||
if (x >= LONG_MIN && x <= LONG_MAX)
|
||||
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
|
||||
return PyLong_FromLongLong(x);
|
||||
|
|
@ -1085,7 +1085,7 @@ lu_longlong(const char *p, const formatdef *f)
|
|||
} while (i > 0);
|
||||
/* Extend the sign bit. */
|
||||
if (SIZEOF_LONG_LONG > f->size)
|
||||
x |= -(x & (1L << ((8 * f->size) - 1)));
|
||||
x |= -(x & ((PY_LONG_LONG)1 << ((8 * f->size) - 1)));
|
||||
if (x >= LONG_MIN && x <= LONG_MAX)
|
||||
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
|
||||
return PyLong_FromLongLong(x);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue