/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: Gary van der Merwe
  • Date: 2010-11-17 13:28:29 UTC
  • mto: This revision was merged to the branch mainline in revision 5543.
  • Revision ID: garyvdm@gmail.com-20101117132829-650xk61klnoeihm9
https://launchpad.net/bugs/588698
Make merge correctly locate a lca where there is a criss-cross merge of a new root.

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