X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/e56eb7d60c3d0929e952cad2d9ea2c711bd52593..0b1b92bd118675e7b54c21c76d1fee39aa9111b8:/catacomb-python.h diff --git a/catacomb-python.h b/catacomb-python.h index bd9a8e5..bf2a840 100644 --- a/catacomb-python.h +++ b/catacomb-python.h @@ -1,6 +1,4 @@ /* -*-c-*- - * - * $Id$ * * Definitions for Catacomb bindings * @@ -46,6 +44,7 @@ #include #include #include +#include #include @@ -77,6 +76,7 @@ #include #include #include +#include #include #include @@ -188,11 +188,11 @@ { #name, ty, offsetof(MEMBERSTRUCT, name), f, doc }, #define MODULES(_) \ + _(util) \ _(bytestring) _(buffer) \ _(rand) _(algorithms) _(pubkey) _(pgen) \ _(mp) _(field) _(ec) _(group) \ - _(passphrase) _(share) _(key) \ - _(util) + _(passphrase) _(share) _(key) #define DOMODINIT(m) m##_pyinit(); #define DOMODINSERT(m) m##_pyinsert(mod); #define INIT_MODULES do { MODULES(DOMODINIT) } while (0) @@ -246,7 +246,7 @@ extern PyObject *getbool(int); extern PyObject *getulong(unsigned long); extern void *newtype(PyTypeObject *, const PyTypeObject *, const char *); -extern PyObject * mkexc(PyObject *, PyObject *, const char *, PyMethodDef *); +extern PyObject *mkexc(PyObject *, PyObject *, const char *, PyMethodDef *); extern PyTypeObject *inittype(PyTypeObject *); extern void addmethods(const PyMethodDef *); extern PyMethodDef *donemethods(void);