/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/_static_tuple_c.h

  • Committer: Andrew Bennetts
  • Date: 2009-10-28 00:12:03 UTC
  • mfrom: (4774 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4775.
  • Revision ID: andrew.bennetts@canonical.com-20091028001203-m7lgs1wtnilgo3br
Merge lp:bzr, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_static_tuple_c.h
74
74
 
75
75
static StaticTuple * StaticTuple_New(Py_ssize_t);
76
76
static StaticTuple * StaticTuple_Intern(StaticTuple *self);
 
77
static StaticTuple * StaticTuple_FromSequence(PyObject *);
77
78
#define StaticTuple_CheckExact(op) (Py_TYPE(op) == &StaticTuple_Type)
78
79
 
79
80
#else
83
84
 
84
85
static StaticTuple *(*StaticTuple_New)(Py_ssize_t);
85
86
static StaticTuple *(*StaticTuple_Intern)(StaticTuple *);
 
87
static StaticTuple *(*StaticTuple_FromSequence)(PyObject *);
86
88
static PyTypeObject *_p_StaticTuple_Type;
87
89
 
88
90
#define StaticTuple_CheckExact(op) (Py_TYPE(op) == _p_StaticTuple_Type)
98
100
            "StaticTuple *(Py_ssize_t)"},
99
101
        {"StaticTuple_Intern", (void **)&StaticTuple_Intern,
100
102
            "StaticTuple *(StaticTuple *)"},
 
103
        {"StaticTuple_FromSequence", (void **)&StaticTuple_FromSequence,
 
104
            "StaticTuple *(PyObject *)"},
101
105
        {"_StaticTuple_CheckExact", (void **)&_StaticTuple_CheckExact,
102
106
            "int(PyObject *)"},
103
107
        {NULL}};