← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_static_tuple_c.h

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 16:25:28 UTC
  • mfrom: (5020.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
        on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_static_tuple_c.h
1
 
/* Copyright (C) 2009, 2010 Canonical Ltd
 
1
/* Copyright (C) 2009 Canonical Ltd
2
2
 * 
3
3
 * This program is free software; you can redistribute it and/or modify
4
4
 * it under the terms of the GNU General Public License as published by
67
67
#define StaticTuple_SET_ITEM(key, offset, val) \
68
68
    ((((StaticTuple*)(key))->items[(offset)]) = ((PyObject *)(val)))
69
69
#define StaticTuple_GET_ITEM(key, offset) (((StaticTuple*)key)->items[offset])
70
 
#define StaticTuple_GET_SIZE(key) (((StaticTuple*)key)->size)
71
70
 
72
71
 
73
72
#ifdef STATIC_TUPLE_MODULE