From 82d4cc27c6b14fd6460c87d66db22e7925b04051 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 28 Apr 2006 05:28:05 +0000
Subject: [PATCH] Fix some warnings on Mac OS X 10.4

---
 Mac/Modules/file/_Filemodule.c |  9 +++++----
 Mac/Modules/mlte/_Mltemodule.c | 17 -----------------
 Modules/_sqlite/cursor.c       |  4 ++++
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/Mac/Modules/file/_Filemodule.c b/Mac/Modules/file/_Filemodule.c
index 81f0c02ee0c..c211de136fa 100644
--- a/Mac/Modules/file/_Filemodule.c
+++ b/Mac/Modules/file/_Filemodule.c
@@ -105,13 +105,14 @@ _PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
 		FSSpec fss2;
 		int tocopy;
 
-		err = FSMakeFSSpec(fss->vRefNum, fss->parID, "", &fss2);
+		err = FSMakeFSSpec(fss->vRefNum, fss->parID,
+				   (unsigned char*)"", &fss2);
 		if (err)
 			return err;
 		err = FSpMakeFSRef(&fss2, &fsr);
 		if (err)
 			return err;
-		err = (OSErr)FSRefMakePath(&fsr, path, len-1);
+		err = (OSErr)FSRefMakePath(&fsr, (unsigned char*)path, len-1);
 		if (err)
 			return err;
 		/* This part is not 100% safe: we append the filename part, but
@@ -123,12 +124,12 @@ _PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
 		if ((strlen(path) + tocopy) >= len)
 			tocopy = len - strlen(path) - 1;
 		if (tocopy > 0)
-			strncat(path, fss->name+1, tocopy);
+			strncat(path, (char*)fss->name+1, tocopy);
 	}
 	else {
 		if (err)
 			return err;
-		err = (OSErr)FSRefMakePath(&fsr, path, len);
+		err = (OSErr)FSRefMakePath(&fsr, (unsigned char*)path, len);
 		if (err)
 			return err;
 	}
diff --git a/Mac/Modules/mlte/_Mltemodule.c b/Mac/Modules/mlte/_Mltemodule.c
index 64ceaf6f0d3..a79b257d765 100644
--- a/Mac/Modules/mlte/_Mltemodule.c
+++ b/Mac/Modules/mlte/_Mltemodule.c
@@ -48,23 +48,6 @@ OptFSSpecPtr_Convert(PyObject *v, FSSpec **p_itself)
         return PyMac_GetFSSpec(v, *p_itself);
 }
 
-/*
-** Parse an optional rect
-*/
-static int
-OptRectPtr_Convert(PyObject *v, Rect **p_itself)
-{
-        static Rect r;
-
-        if (v == Py_None)
-        {
-                *p_itself = NULL;
-                return 1;
-        }
-        *p_itself = &r;
-        return PyMac_GetRect(v, *p_itself);
-}
-
 /*
 ** Parse an optional GWorld
 */
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 8c724121d55..6ee8beaf904 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -27,8 +27,12 @@
 #include "sqlitecompat.h"
 
 /* used to decide wether to call PyInt_FromLong or PyLong_FromLongLong */
+#ifndef INT32_MIN
 #define INT32_MIN (-2147483647 - 1)
+#endif
+#ifndef INT32_MAX
 #define INT32_MAX 2147483647
+#endif
 
 PyObject* cursor_iternext(Cursor *self);