Fix some warnings from MSVC

zooba · zooba · commit a439191efa9f · 2016-09-06T19:09:15.000-07:00
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -3067,7 +3067,7 @@ static PyGetSetDef PyCFuncPtr_getsets[] = {
 };
 
 #ifdef MS_WIN32
-static PPROC FindAddress(void *handle, char *name, PyObject *type)
+static PPROC FindAddress(void *handle, const char *name, PyObject *type)
 {
 #ifdef MS_WIN64
     /* win64 has no stdcall calling conv, so it should
diff --git a/Modules/_decimal/libmpdec/vccompat.h b/Modules/_decimal/libmpdec/vccompat.h
@@ -48,10 +48,6 @@
   #undef strtoll
   #define strtoll _strtoi64
   #define strdup _strdup
-  #define PRIi64 "I64i"
-  #define PRIu64 "I64u"
-  #define PRIi32 "I32i"
-  #define PRIu32 "I32u"
 #endif
 
 
diff --git a/Modules/audioop.c b/Modules/audioop.c
@@ -4,6 +4,7 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
+#include <inttypes.h>
 
 typedef short PyInt16;
 
@@ -448,7 +449,7 @@ audioop_max_impl(PyObject *module, Py_buffer *fragment, int width)
         int val = GETRAWSAMPLE(width, fragment->buf, i);
         /* Cast to unsigned before negating. Unsigned overflow is well-
         defined, but signed overflow is not. */
-        if (val < 0) absval = -(unsigned int)val;
+        if (val < 0) absval = (unsigned int)-(int64_t)val;
         else absval = val;
         if (absval > max) max = absval;
     }
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c
@@ -58,7 +58,7 @@ main(int argc, char *argv[])
         fprintf(stderr, "cannot fstat '%s'\n", inpath);
         goto error;
     }
-    text_size = status.st_size;
+    text_size = (size_t)status.st_size;
     text = (char *) malloc(text_size + 1);
     if (text == NULL) {
         fprintf(stderr, "could not allocate %ld bytes\n", (long) text_size);

Original file line number	Diff line number	Diff line change
`@@ -3067,7 +3067,7 @@ static PyGetSetDef PyCFuncPtr_getsets[] = {`
`3067`	`3067`	`};`
`3068`	`3068`
`3069`	`3069`	`#ifdef MS_WIN32`
`3070`		`-static PPROC FindAddress(void handle, char name, PyObject *type)`
	`3070`	`+static PPROC FindAddress(void handle, const char name, PyObject *type)`
`3071`	`3071`	`{`
`3072`	`3072`	`#ifdef MS_WIN64`
`3073`	`3073`	`/* win64 has no stdcall calling conv, so it should`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ main(int argc, char *argv[])`
`58`	`58`	`fprintf(stderr, "cannot fstat '%s'\n", inpath);`
`59`	`59`	`goto error;`
`60`	`60`	`}`
`61`		`- text_size = status.st_size;`
	`61`	`+ text_size = (size_t)status.st_size;`
`62`	`62`	`text = (char *) malloc(text_size + 1);`
`63`	`63`	`if (text == NULL) {`
`64`	`64`	`fprintf(stderr, "could not allocate %ld bytes\n", (long) text_size);`