← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_btree_serializer_pyx.pyx

Merge the 2.0 branch, resolve one conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_btree_serializer_pyx.pyx
65
65
 
66
66
 
67
67
# TODO: Find some way to import this from _dirstate_helpers
68
 
cdef void* _my_memrchr(void *s, int c, size_t n):
 
68
cdef void* _my_memrchr(void *s, int c, size_t n): # cannot_raise
69
69
    # memrchr seems to be a GNU extension, so we have to implement it ourselves
70
70
    # It is not present in any win32 standard library
71
71
    cdef char *pos