Fix compilation warnings on Windows (GH-8627)
* Fix compilation warning in _ctypes module on Window
(cherry picked from commit 20f11fe43c47b68c8b9dd6539d2d40b66c9957f9)
* Fix compilation warnings on Windows 64-bit
(cherry picked from commit 725e4212229bf68f87d4f66c1815d444ddfc7aa5)
* Fix compiler warning in unicodeobject.c
Explicitly case to Py_UNICODE to fix the warning:
Objects\unicodeobject.c(4225): warning C4244: '=' :
conversion from 'long' to 'Py_UNICODE', possible loss of data
The downcast cannot overflow since we check that value <= 0x10ffff.
diff --git a/Modules/_ctypes/libffi_msvc/ffi.c b/Modules/_ctypes/libffi_msvc/ffi.c
index f28c3e0..587c94b 100644
--- a/Modules/_ctypes/libffi_msvc/ffi.c
+++ b/Modules/_ctypes/libffi_msvc/ffi.c
@@ -119,7 +119,7 @@
argp += z;
}
- if (argp - stack > ecif->cif->bytes)
+ if (argp >= stack && (unsigned)(argp - stack) > ecif->cif->bytes)
{
Py_FatalError("FFI BUG: not enough stack space for arguments");
}
diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c
index a24dd8c..7377225 100644
--- a/Modules/_sqlite/util.c
+++ b/Modules/_sqlite/util.c
@@ -132,7 +132,7 @@
}
# endif
#endif
- return PyInt_FromLong(value);
+ return PyInt_FromLong(Py_SAFE_DOWNCAST(value, sqlite_int64, long));
}
sqlite_int64
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 8bf04df..b76db61 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4222,7 +4222,7 @@
p = PyUnicode_AS_UNICODE(v) + oldpos;
}
value -= 0x10000;
- *p++ = 0xD800 | (value >> 10);
+ *p++ = 0xD800 | (Py_UNICODE)(value >> 10);
*p++ = 0xDC00 | (value & 0x3FF);
extrachars -= 2;
}