diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-26 19:59:23 (GMT) |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-26 19:59:23 (GMT) |
commit | e052b64def35c09b777ba7b9e042919a42ab608f (patch) | |
tree | dd5123a27faa9d46eda3b610dc015689cb32d90d /Modules/_io/_iomodule.h | |
parent | d9ff74e51dc0ede17116b590e2e544d1a2b7fe39 (diff) | |
download | cpython-e052b64def35c09b777ba7b9e042919a42ab608f.zip cpython-e052b64def35c09b777ba7b9e042919a42ab608f.tar.gz cpython-e052b64def35c09b777ba7b9e042919a42ab608f.tar.bz2 |
Use correct conversion specifier and length modifier when printing an
integer of type off_t. Also, don't assume that long long is available.
Diffstat (limited to 'Modules/_io/_iomodule.h')
-rw-r--r-- | Modules/_io/_iomodule.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h index e220ec1..35a3146 100644 --- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -83,26 +83,30 @@ typedef PY_LONG_LONG Py_off_t; # define PyLong_FromOff_t PyLong_FromLongLong # 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 */ #else /* Other platforms use off_t */ typedef off_t Py_off_t; -#if (SIZEOF_OFF_T == SIZEOF_SIZE_T) -# define PyLong_AsOff_t PyLong_AsSsize_t -# define PyLong_FromOff_t PyLong_FromSsize_t -# define PY_OFF_T_MAX PY_SSIZE_T_MAX -# define PY_OFF_T_MIN PY_SSIZE_T_MIN -#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG) +#if (HAVE_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG) # define PyLong_AsOff_t PyLong_AsLongLong # define PyLong_FromOff_t PyLong_FromLongLong # define PY_OFF_T_MAX PY_LLONG_MAX # define PY_OFF_T_MIN PY_LLONG_MIN +# define PY_PRIdOFF "lld" #elif (SIZEOF_OFF_T == SIZEOF_LONG) # define PyLong_AsOff_t PyLong_AsLong # define PyLong_FromOff_t PyLong_FromLong # define PY_OFF_T_MAX LONG_MAX # define PY_OFF_T_MIN LONG_MIN +# define PY_PRIdOFF "ld" +#elif (SIZEOF_OFF_T == SIZEOF_SIZE_T) +# define PyLong_AsOff_t PyLong_AsSsize_t +# define PyLong_FromOff_t PyLong_FromSsize_t +# define PY_OFF_T_MAX PY_SSIZE_T_MAX +# define PY_OFF_T_MIN PY_SSIZE_T_MIN +# define PY_PRIdOFF "zd" #else # error off_t does not match either size_t, long, or long long! #endif |