From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 22 Sep 2006 08:47:23 +0000 (+0000)
Subject: Mostly revert this file to the same version as before.  Only force setting
X-Git-Tag: v2.6a1~2644
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02743ca0146c2cbedfeb0c05d7f3731fab281575;p=python

Mostly revert this file to the same version as before.  Only force setting
of PY_FORMAT_SIZE_T to "l" for Mac OSX.  I don't know a better define
to use.  This should get rid of the warnings on other platforms and Mac too.
---

diff --git a/Include/pyport.h b/Include/pyport.h
index 16ee011272..8f8e514c34 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -126,10 +126,10 @@ typedef Py_intptr_t	Py_ssize_t;
  * Py_ssize_t on the platform.
  */
 #ifndef PY_FORMAT_SIZE_T
-#   if SIZEOF_SIZE_T == SIZEOF_LONG
-#       define PY_FORMAT_SIZE_T "l"
-#   elif SIZEOF_SIZE_T == SIZEOF_INT
+#   if SIZEOF_SIZE_T == SIZEOF_INT && !defined(__APPLE__)
 #       define PY_FORMAT_SIZE_T ""
+#   elif SIZEOF_SIZE_T == SIZEOF_LONG
+#       define PY_FORMAT_SIZE_T "l"
 #   elif defined(MS_WINDOWS)
 #       define PY_FORMAT_SIZE_T "I"
 #   else