← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/python-compat.h

  • Committer: Vincent Ladeuil
  • Date: 2011-01-20 21:15:10 UTC
  • mfrom: (5050.62.4 2.2)
  • mto: (5609.2.4 2.3)
  • mto: This revision was merged to the branch mainline in revision 5628.
  • Revision ID: v.ladeuil+lp@free.fr-20110120211510-9dl4tbl77dad86pl
Merge 2.2 into 2.3 including bugfix for #701940

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/python-compat.h
74
74
 
75
75
#ifdef _MSC_VER
76
76
#define  snprintf  _snprintf
 
77
/* gcc (mingw32) has strtoll, while the MSVC compiler uses _strtoi64 */
 
78
#define strtoll _strtoi64
 
79
#define strtoull _strtoui64
77
80
#endif
78
81
 
79
82
/* Introduced in Python 2.6 */