Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn´t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
diff --git a/Objects/intobject.c b/Objects/intobject.c
index 9ffc295..a82b3c8 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -215,6 +215,10 @@
if (nb->nb_long != 0) {
io = (PyIntObject*) (*nb->nb_long) (op);
+ if (io == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
+ PyErr_Clear();
+ io = (PyIntObject*) (*nb->nb_int) (op);
+ }
} else {
io = (PyIntObject*) (*nb->nb_int) (op);
}
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 6d55354..a8663bc 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -893,7 +893,7 @@
int one = 1;
return _PyLong_FromByteArray(
(unsigned char *)&bytes,
- SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 0);
+ SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 1);
}
/* Create a new long int object from a C size_t. */