/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/python-compat.h

  • Committer: Vincent Ladeuil
  • Date: 2010-11-05 14:07:45 UTC
  • mfrom: (5050.45.7 2.2)
  • mto: This revision was merged to the branch mainline in revision 5524.
  • Revision ID: v.ladeuil+lp@free.fr-20101105140745-e5xwb9b75a4i7ef1
Merge 2.2 into trunk resolving conflicts and including fix for bug #632465

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 */