Tweaks to keep the Microsoft compiler quier.

diff --git a/Modules/audioop.c b/Modules/audioop.c
index 0e95c91d578b9cd74ac0817fafe1dee777dc4103..003f8af5cb7e69df13355329ed85dda83a00e206 100644 (file)
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -255,7 +255,7 @@ audioop_avg(self, args)
        signed char *cp;
        int len, size, val = 0;
        int i;
-       float avg = 0.0;
+       double avg = 0.0;
 
        if ( !PyArg_Parse(args, "(s#i)", &cp, &len, &size) )
                return 0;
@@ -272,7 +272,7 @@ audioop_avg(self, args)
        if ( len == 0 )
                val = 0;
        else
-               val = (int)(avg / (float)(len/size));
+               val = (int)(avg / (double)(len/size));
        return PyInt_FromLong(val);
 }
 
@@ -284,7 +284,7 @@ audioop_rms(self, args)
        signed char *cp;
        int len, size, val = 0;
        int i;
-       float sum_squares = 0.0;
+       double sum_squares = 0.0;
 
        if ( !PyArg_Parse(args, "(s#i)", &cp, &len, &size) )
                return 0;
@@ -296,12 +296,12 @@ audioop_rms(self, args)
                if ( size == 1 )      val = (int)*CHARP(cp, i);
                else if ( size == 2 ) val = (int)*SHORTP(cp, i);
                else if ( size == 4 ) val = (int)*LONGP(cp, i);
-               sum_squares += (float)val*(float)val;
+               sum_squares += (double)val*(double)val;
        }
        if ( len == 0 )
                val = 0;
        else
-               val = (int)sqrt(sum_squares / (float)(len/size));
+               val = (int)sqrt(sum_squares / (double)(len/size));
        return PyInt_FromLong(val);
 }
 
@@ -498,7 +498,7 @@ audioop_avgpp(self, args)
        int len, size, val = 0, prevval = 0, prevextremevalid = 0,
                prevextreme = 0;
        int i;
-       float avg = 0.0;
+       double avg = 0.0;
        int diff, prevdiff, extremediff, nextreme = 0;
 
        if ( !PyArg_Parse(args, "(s#i)", &cp, &len, &size) )
@@ -544,7 +544,7 @@ audioop_avgpp(self, args)
        if ( nextreme == 0 )
                val = 0;
        else
-               val = (int)(avg / (float)nextreme);
+               val = (int)(avg / (double)nextreme);
        return PyInt_FromLong(val);
 }
 

diff --git a/Modules/imageop.c b/Modules/imageop.c
index 0f8e0ed5ddb3c2c15692668075afba3bf3f96eb0..007c83e0918906bf2420e077b1bbea0080300ac0 100644 (file)
--- a/Modules/imageop.c
+++ b/Modules/imageop.c
@@ -572,7 +572,7 @@ PyObject *args;
                b = (int) (((value >> 16) & 0xff) / 255. * 3. + .5);
 #endif
                nvalue = (r<<5) | (b<<3) | g;
-               *ncp++ = nvalue;
+               *ncp++ = (unsigned char)nvalue;
        }
        return rv;
 }
@@ -653,7 +653,7 @@ PyObject *args;
                b = (value >> 16) & 0xff;
                nvalue = (int)(0.30*r + 0.59*g + 0.11*b);
                if ( nvalue > 255 ) nvalue = 255;
-               *ncp++ = nvalue;
+               *ncp++ = (unsigned char)nvalue;
        }
        return rv;
 }

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 7ca697afc7f9e80af9a36d43bdb9783b7cfb925b..e62be1fef03b845f098d6c2ba26fb246d5d68610 100644 (file)
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -31,9 +31,15 @@ PERFORMANCE OF THIS SOFTWARE.
 
 /* Signal module -- many thanks to Lance Ellinghaus */
 
+/* XXX Signals should be recorded per thread, now we have thread state. */
+
 #include "Python.h"
 #include "intrcheck.h"
 
+#ifdef MS_WIN32
+#include <process.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -119,7 +125,8 @@ signal_handler(sig_num)
 #endif
                is_tripped++;
                Handlers[sig_num].tripped = 1;
-               Py_AddPendingCall((int (*) Py_PROTO((ANY *)))PyErr_CheckSignals, NULL);
+               Py_AddPendingCall(
+                       (int (*) Py_PROTO((ANY *)))PyErr_CheckSignals, NULL);
 #ifdef WITH_THREAD
        }
 #endif

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 27eb31334989d9b9579fb977cc5670a0337e280e..7b73b632e1b1630e37534f5ee4a1427bf1093d02 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -417,7 +417,7 @@ getsockaddrarg,PySocketSockObject *,s, PyObject *,args, struct sockaddr **,addr_
                if (setipaddr(host, addr) < 0)
                        return 0;
                addr->sin_family = AF_INET;
-               addr->sin_port = htons(port);
+               addr->sin_port = htons((short)port);
                *addr_ret = (struct sockaddr *) addr;
                *len_ret = sizeof *addr;
                return 1;
@@ -516,7 +516,9 @@ static PyObject *
 BUILD_FUNC_DEF_2(PySocketSock_setblocking,PySocketSockObject*,s,PyObject*,args)
 {
        int block;
+#ifndef MS_WINDOWS
        int delay_flag;
+#endif
        if (!PyArg_GetInt(args, &block))
                return NULL;
        Py_BEGIN_ALLOW_THREADS

diff --git a/Python/compile.c b/Python/compile.c
index 7d9a3a8921814efba80bb5628ea11a4f499f4d39..21629abd9cc8e5bb0268f79503817d9cd112e705 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -182,6 +182,9 @@ typeobject Codetype = {
        (hashfunc)code_hash, /*tp_hash*/
 };
 
+#define NAME_CHARS \
+       "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
+
 codeobject *
 newcodeobject(argcount, nlocals, stacksize, flags,
              code, consts, names, varnames, filename, name,
@@ -237,7 +240,7 @@ newcodeobject(argcount, nlocals, stacksize, flags,
                if (!is_stringobject(v))
                        continue;
                p = getstringvalue(v);
-               if (strspn(p, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz")
+               if ((int)strspn(p, NAME_CHARS)
                    != getstringsize(v))
                        continue;
                PyString_InternInPlace(&PyTuple_GET_ITEM(consts, i));

diff --git a/Python/importdl.c b/Python/importdl.c
index 2abef33c0bbee8bf83dfafbd8b9b16f200f5e4ef..02f87dcce2a7e2e59db4b2717c6686c26ff76e69 100644 (file)
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -503,13 +503,16 @@ load_dynamic_module(name, pathname, fp)
                         perror(funcname);
        }
 #endif /* hpux */
+#ifdef USE_SHLIB
   got_it:
+#endif
        if (p == NULL) {
                err_setstr(ImportError,
                   "dynamic module does not define init function");
                return NULL;
        }
        (*p)();
+       /* XXX Need check for err_occurred() here */
 
        m = dictlookup(import_modules, name);
        if (m == NULL) {

diff --git a/Python/mystrtoul.c b/Python/mystrtoul.c
index a869b4681a0a49c4ea4475c58f47643bc4230451..ed0e52648d6be8b8e32f03dbe196e3d7b514a8e4 100644 (file)
--- a/Python/mystrtoul.c
+++ b/Python/mystrtoul.c
@@ -141,7 +141,7 @@ int         base;
        *ptr = str;
     if (ovf)
     {
-       result = ~0;
+       result = (unsigned long) ~0L;
        errno = ERANGE;
     }
     return result;

diff --git a/Python/structmember.c b/Python/structmember.c
index 7e24fa5153d5c9f9450f69edf3e8e4184f5567d1..f5cca977c7d682625c9453c6f721f0d20544f79a 100644 (file)
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -186,7 +186,7 @@ setmember(addr, mlist, name, v)
                                        err_badarg();
                                        return -1;
                                }
-                               *(char*)addr = getintvalue(v);
+                               *(char*)addr = (char) getintvalue(v);
                                break;
                        case T_SHORT:
                        case T_USHORT:
@@ -194,7 +194,7 @@ setmember(addr, mlist, name, v)
                                        err_badarg();
                                        return -1;
                                }
-                               *(short*)addr = getintvalue(v);
+                               *(short*)addr = (short) getintvalue(v);
                                break;
                        case T_UINT:
                        case T_INT:
@@ -202,7 +202,7 @@ setmember(addr, mlist, name, v)
                                        err_badarg();
                                        return -1;
                                }
-                               *(int*)addr = getintvalue(v);
+                               *(int*)addr = (int) getintvalue(v);
                                break;
                        case T_LONG:
                                if (!is_intobject(v)) {
@@ -223,9 +223,10 @@ setmember(addr, mlist, name, v)
                                break;
                        case T_FLOAT:
                                if (is_intobject(v))
-                                       *(float*)addr = getintvalue(v);
+                                       *(float*)addr = (float) getintvalue(v);
                                else if (is_floatobject(v))
-                                       *(float*)addr = getfloatvalue(v);
+                                       *(float*)addr =
+                                               (float) getfloatvalue(v);
                                else {
                                        err_badarg();
                                        return -1;
@@ -233,7 +234,8 @@ setmember(addr, mlist, name, v)
                                break;
                        case T_DOUBLE:
                                if (is_intobject(v))
-                                       *(double*)addr = getintvalue(v);
+                                       *(double*)addr =
+                                               (double) getintvalue(v);
                                else if (is_floatobject(v))
                                        *(double*)addr = getfloatvalue(v);
                                else {