Merged revisions 75907 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75907 | mark.dickinson | 2009-10-28 07:25:03 +0000 (Wed, 28 Oct 2009) | 9 lines

  Merged revisions 75905 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75905 | mark.dickinson | 2009-10-28 07:23:49 +0000 (Wed, 28 Oct 2009) | 1 line

    Replace long long with PY_LONG_LONG
  ........
................

diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h
index b621c51597c272146ea10a7a158aeaac2d511ba3..08589513a5b71511c6435c8bda8f3103f7fefc21 100644 (file)
--- a/Modules/_io/_iomodule.h
+++ b/Modules/_io/_iomodule.h
@@ -87,7 +87,7 @@ typedef PY_LONG_LONG Py_off_t;
 # define PY_OFF_T_MAX       PY_LLONG_MAX
 # define PY_OFF_T_MIN       PY_LLONG_MIN
 # define PY_PRIdOFF         "lld" /* format to use in printf with type off_t */
-# define PY_OFF_T_COMPAT    long long /* standard type compatible with off_t */
+# define PY_OFF_T_COMPAT    PY_LONG_LONG /* type compatible with off_t */
 #else
 
 /* Other platforms use off_t */
@@ -98,7 +98,7 @@ typedef off_t Py_off_t;
 # define PY_OFF_T_MAX       PY_LLONG_MAX
 # define PY_OFF_T_MIN       PY_LLONG_MIN
 # define PY_PRIdOFF         "lld"
-# define PY_OFF_T_COMPAT    long long
+# define PY_OFF_T_COMPAT    PY_LONG_LONG
 #elif (SIZEOF_OFF_T == SIZEOF_LONG)
 # define PyLong_AsOff_t     PyLong_AsLong
 # define PyLong_FromOff_t   PyLong_FromLong