catacomb-python.h: Promote `util' to the head of the list.

[catacomb-python] / catacomb-python.h

diff --git a/catacomb-python.h b/catacomb-python.h
index bd9a8e5574548c98a314f88777c82188fb5a7fa7..bf2a840cc33cb8c557b7b98527e4dabfbeee0f30 100644 (file)
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -1,6 +1,4 @@
 /* -*-c-*-
 /* -*-c-*-

- *
- * $Id$

  *
  * Definitions for Catacomb bindings
  *
  *
  * Definitions for Catacomb bindings
  *


@@ -46,6 +44,7 @@
 #include <mLib/dstr.h>
 #include <mLib/macros.h>
 #include <mLib/quis.h>
 #include <mLib/dstr.h>
 #include <mLib/macros.h>
 #include <mLib/quis.h>

+#include <mLib/unihash.h>

 
 #include <catacomb/buf.h>
 
 
 #include <catacomb/buf.h>
 


@@ -77,6 +76,7 @@
 #include <catacomb/mpmont.h>
 #include <catacomb/mpbarrett.h>
 #include <catacomb/mpreduce.h>
 #include <catacomb/mpmont.h>
 #include <catacomb/mpbarrett.h>
 #include <catacomb/mpreduce.h>

+#include <catacomb/mp-fibonacci.h>

 
 #include <catacomb/pgen.h>
 #include <catacomb/pfilt.h>
 
 #include <catacomb/pgen.h>
 #include <catacomb/pfilt.h>


@@ -188,11 +188,11 @@
   { #name, ty, offsetof(MEMBERSTRUCT, name), f, doc },
 
 #define MODULES(_)                                                     \
   { #name, ty, offsetof(MEMBERSTRUCT, name), f, doc },
 
 #define MODULES(_)                                                     \

+  _(util)                                                              \

   _(bytestring) _(buffer)                                              \
   _(rand) _(algorithms) _(pubkey) _(pgen)                              \
   _(mp) _(field) _(ec) _(group)                                                \
   _(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)
 #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 *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);
 extern PyTypeObject *inittype(PyTypeObject *);
 extern void addmethods(const PyMethodDef *);
 extern PyMethodDef *donemethods(void);