← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/python-compat.h

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

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
80
77
#endif
81
78
 
82
79
/* Introduced in Python 2.6 */