summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2013-10-31 17:38:24 (GMT)
committerTim Golden <mail@timgolden.me.uk>2013-10-31 17:38:24 (GMT)
commit637412075081ced0136a012f039806f292c999a5 (patch)
treebcbb8d26d0766fbde9be052c1246af893258a3bd /Modules
parent2915dd7103730580a63760a8b4166d2137666920 (diff)
downloadcpython-637412075081ced0136a012f039806f292c999a5.zip
cpython-637412075081ced0136a012f039806f292c999a5.tar.gz
cpython-637412075081ced0136a012f039806f292c999a5.tar.bz2
Issue #19418 Fix some warnings on Win64
Diffstat (limited to 'Modules')
-rw-r--r--Modules/audioop.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/audioop.c b/Modules/audioop.c
index 7e40bbd..3f04762 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -27,7 +27,8 @@ typedef short PyInt16;
#endif
static const int maxvals[] = {0, 0x7F, 0x7FFF, 0x7FFFFF, 0x7FFFFFFF};
-static const int minvals[] = {0, -0x80, -0x8000, -0x800000, -0x80000000};
+/* -1 trick is needed on Windows to support -0x80000000 without a warning */
+static const int minvals[] = {0, -0x80, -0x8000, -0x800000, -0x7FFFFFFF-1};
static const unsigned int masks[] = {0, 0xFF, 0xFFFF, 0xFFFFFF, 0xFFFFFFFF};
static int
@@ -385,7 +386,9 @@ audioop_minmax(PyObject *self, PyObject *args)
signed char *cp;
Py_ssize_t len, i;
int size, val = 0;
- int min = 0x7fffffff, max = -0x80000000;
+ /* -1 trick below is needed on Windows to support -0x80000000 without
+ a warning */
+ int min = 0x7fffffff, max = -0x7FFFFFFF-1;
if (!PyArg_ParseTuple(args, "s#i:minmax", &cp, &len, &size))
return NULL;