[Python-checkins] r75912 - in python/branches/release31-maint: Modules/_io/_iomodule.h

[mark.dickinson]

Author: mark.dickinson
Date: Wed Oct 28 08:50:03 2009
New Revision: 75912

Log:
Merged revisions 75911 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75911 | mark.dickinson | 2009-10-28 07:49:26 +0000 (Wed, 28 Oct 2009) | 9 lines
  
  Merged revisions 75909 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r75909 | mark.dickinson | 2009-10-28 07:47:32 +0000 (Wed, 28 Oct 2009) | 1 line
    
    Fix format specifier for MSVC
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/_io/_iomodule.h

Modified: python/branches/release31-maint/Modules/_io/_iomodule.h
==============================================================================
--- python/branches/release31-maint/Modules/_io/_iomodule.h	(original)
+++ python/branches/release31-maint/Modules/_io/_iomodule.h	Wed Oct 28 08:50:03 2009
@@ -86,7 +86,7 @@
 # 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 */
+# define PY_PRIdOFF         "I64d" /* format to use in printf with type off_t */
 # define PY_OFF_T_COMPAT    PY_LONG_LONG /* type compatible with off_t */
 #else