/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: John Arbash Meinel
  • Date: 2011-05-17 11:27:58 UTC
  • mto: This revision was merged to the branch mainline in revision 5880.
  • Revision ID: john@arbash-meinel.com-20110517112758-eayd47x2h1jdp4zo
https://launchpad.net/bugs/781168
Fix bug #781168, and allow WT.update_basis_by_delta
to apply a delta that does not match the WT state. The check is nice to have
for commit, but it doesn't make sense to have for uncommit, etc.

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