diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2006-10-07 14:56:30 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2006-10-07 14:56:30 (GMT) |
| commit | 2c8851e614cefa4b4056338423dc71501dc8773c (patch) | |
| tree | fe89a71da23d9e48d7384010cbc11cbd8ccc6372 /Modules | |
| parent | f6d7371ec7b72d1cf496c840d4082dc1fb5e52c9 (diff) | |
| download | cpython-2c8851e614cefa4b4056338423dc71501dc8773c.zip cpython-2c8851e614cefa4b4056338423dc71501dc8773c.tar.gz cpython-2c8851e614cefa4b4056338423dc71501dc8773c.tar.bz2 | |
Backport the .sln and .vcproj files for PCBuild8 from the python trunk to the 2.5 maintainance branch. This fixes build problems with visual studio 2005, and cleans up profile guided optimization.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_struct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_struct.c b/Modules/_struct.c index 22d0e03..fb50987 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -820,7 +820,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); @@ -1038,7 +1038,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); |