[Python-checkins] r45775 - in python/trunk: Mac/Modules/file/_Filemodule.c Mac/Modules/mlte/_Mltemodule.c Modules/_sqlite/cursor.c
neal.norwitz
python-checkins at python.org
Fri Apr 28 07:28:07 CEST 2006
Author: neal.norwitz
Date: Fri Apr 28 07:28:05 2006
New Revision: 45775
Modified:
python/trunk/Mac/Modules/file/_Filemodule.c
python/trunk/Mac/Modules/mlte/_Mltemodule.c
python/trunk/Modules/_sqlite/cursor.c
Log:
Fix some warnings on Mac OS X 10.4
Modified: python/trunk/Mac/Modules/file/_Filemodule.c
==============================================================================
--- python/trunk/Mac/Modules/file/_Filemodule.c (original)
+++ python/trunk/Mac/Modules/file/_Filemodule.c Fri Apr 28 07:28:05 2006
@@ -105,13 +105,14 @@
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 @@
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;
}
Modified: python/trunk/Mac/Modules/mlte/_Mltemodule.c
==============================================================================
--- python/trunk/Mac/Modules/mlte/_Mltemodule.c (original)
+++ python/trunk/Mac/Modules/mlte/_Mltemodule.c Fri Apr 28 07:28:05 2006
@@ -49,23 +49,6 @@
}
/*
-** 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
*/
static int
Modified: python/trunk/Modules/_sqlite/cursor.c
==============================================================================
--- python/trunk/Modules/_sqlite/cursor.c (original)
+++ python/trunk/Modules/_sqlite/cursor.c Fri Apr 28 07:28:05 2006
@@ -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);
More information about the Python-checkins
mailing list