From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 24 Feb 2006 15:39:29 +0000 (+0000)
Subject: Fix a couple of warnings on Mac OS X.
X-Git-Tag: v2.5a0~548
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8786eb5e9220dc85ab3190ca0d47375acd08ff30;p=thirdparty%2FPython%2Fcpython.git

Fix a couple of warnings on Mac OS X.
---

diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index 0041f765aea9..6786ea029cb3 100644
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -131,7 +131,7 @@ filldialogoptions(PyObject *d,
 		OSType *fileTypeP,
 		OSType *fileCreatorP)
 {
-	int pos = 0;
+	Py_ssize_t pos = 0;
 	PyObject *key, *value;
 	char *keystr;
 	AEDesc *defaultLocation_storage;
diff --git a/Mac/Modules/cf/pycfbridge.c b/Mac/Modules/cf/pycfbridge.c
index 30122dcdd06f..ae9e128eac7c 100644
--- a/Mac/Modules/cf/pycfbridge.c
+++ b/Mac/Modules/cf/pycfbridge.c
@@ -283,7 +283,7 @@ PyCF_Python2CF_string(PyObject *src, CFStringRef *dst) {
 	
 	if (PyString_Check(src)) {
 		if (!PyArg_Parse(src, "es", "ascii", &chars))
-			return NULL; /* This error is more descriptive than the general one below */
+			return 0; /* This error is more descriptive than the general one below */
 		*dst = CFStringCreateWithCString((CFAllocatorRef)NULL, chars, kCFStringEncodingASCII);
 		return 1;
 	}