Get rid of some warnings on Mac

diff --git a/Mac/Modules/carbonevt/_CarbonEvtmodule.c b/Mac/Modules/carbonevt/_CarbonEvtmodule.c
index fee43cc229ef523fac16cd388d1dadb167f4afea..fd4b266b8cba669c9111c48d3b79ade308d0163a 100755 (executable)
--- a/Mac/Modules/carbonevt/_CarbonEvtmodule.c
+++ b/Mac/Modules/carbonevt/_CarbonEvtmodule.c
@@ -40,7 +40,7 @@ EventTypeSpec_Convert(PyObject *v, EventTypeSpec *out)
                         PyMac_GetOSType, &(out->eventClass),
                         &(out->eventKind)))
                 return 1;
-        return NULL;
+        return 0;
 }
 
 /********** end EventTypeSpec *******/
@@ -78,7 +78,7 @@ EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out)
 {
         if (PyArg_ParseTuple(v, "ll", &out->signature, &out->id))
                 return 1;
-        return NULL;
+        return 0;
 }
 
 /********** end EventHotKeyID *******/

diff --git a/Mac/Modules/qd/_Qdmodule.c b/Mac/Modules/qd/_Qdmodule.c
index 118dfc47d7d075a916e6fee0d454c8238dae8917..bfb040fe1c1aa5ddf6bd8a944f05ac64f41286a2 100644 (file)
--- a/Mac/Modules/qd/_Qdmodule.c
+++ b/Mac/Modules/qd/_Qdmodule.c
@@ -5824,7 +5824,6 @@ static PyObject *Qd_MacDrawText(PyObject *_self, PyObject *_args)
 {
        PyObject *_res = NULL;
        char *textBuf__in__;
-       int textBuf__len__;
        int textBuf__in_len__;
        short firstByte;
        short byteCount;
@@ -5885,7 +5884,6 @@ static PyObject *Qd_TextWidth(PyObject *_self, PyObject *_args)
        PyObject *_res = NULL;
        short _rv;
        char *textBuf__in__;
-       int textBuf__len__;
        int textBuf__in_len__;
        short firstByte;
        short byteCount;
@@ -6471,7 +6469,6 @@ static PyObject *Qd_DrawText(PyObject *_self, PyObject *_args)
 {
        PyObject *_res = NULL;
        char *textBuf__in__;
-       int textBuf__len__;
        int textBuf__in_len__;
        short firstByte;
        short byteCount;
@@ -6534,7 +6531,7 @@ static PyObject *Qd_RawBitMap(PyObject *_self, PyObject *_args)
                return NULL;
        if ( PyString_Size(source) != sizeof(BitMap) && PyString_Size(source) != sizeof(PixMap) ) {
                PyErr_Format(PyExc_TypeError,
-                       "Argument size was %d, should be %d (sizeof BitMap) or %d (sizeof PixMap)",
+                       "Argument size was %ld, should be %lu (sizeof BitMap) or %lu (sizeof PixMap)",
                        PyString_Size(source), sizeof(BitMap), sizeof(PixMap));
                return NULL;
        }