commit 3b0cae9cc06374eb7a7159f1328ec700208d6109
author Bob Ippolito <bob@redivi.com> Thu May 25 19:15:27 2006 +0000
committer Bob Ippolito <bob@redivi.com> Thu May 25 19:15:27 2006 +0000
tree f1ffcd5d7c09acbe01030f8fdeb6bac058812a95
parent 3fc2bb9ccd6dc6b9b354bf31337297b5d3e3b44b

fix a struct regression where long would be returned for short unsigned integers

Modules/_struct.c

diff --git a/Modules/_struct.c b/Modules/_struct.c
index ec896bf..1c885b7 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -609,6 +609,9 @@
 #ifdef PY_USE_INT_WHEN_POSSIBLE
 	if (x <= INT_MAX)
 		return PyInt_FromLong((long)x);
+#else
+	if (SIZEOF_LONG > f->size)
+		return PyInt_FromLong((long)x);
 #endif
 	return PyLong_FromUnsignedLong(x);
 }
@@ -805,6 +808,9 @@
 #ifdef PY_USE_INT_WHEN_POSSIBLE
 	if (x <= INT_MAX)
 		return PyInt_FromLong((long)x);
+#else
+	if (SIZEOF_LONG > f->size)
+		return PyInt_FromLong((long)x);
 #endif
 	return PyLong_FromUnsignedLong((long)x);
 }