X-Git-Url: https://git.distorted.org.uk/~mdw/pyke/blobdiff_plain/68ec53f32a22b0c38e3b7b53e03edf747c49e416..0b1eafbfd841149f61b47be54713a642f8538a6a:/catacomb-python.h

diff --git a/catacomb-python.h b/catacomb-python.h
index 286dd9e..dafe0fd 100644
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -7,7 +7,7 @@
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the Python interface to Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Catacomb/Python is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Catacomb/Python; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -152,6 +152,11 @@
     return (0);								\
   }
 
+#if PY_VERSION_HEX < 0x02050000		/* Compatibility hack */
+#  define ht_name name
+#  define ht_type type
+#endif
+
 #define root_pytype 0
 #define type_pytype &PyType_Type
 #define INITTYPE(ty, base) do {						\
@@ -161,7 +166,7 @@
 
 #define INSERT(name, ob) do {						\
   PyObject *_o = (PyObject *)(ob);					\
-  Py_INCREF(_o); 							\
+  Py_INCREF(_o);							\
   PyModule_AddObject(mod, name, _o);					\
 } while (0)
 
@@ -237,8 +242,7 @@ extern int convszt(PyObject *, void *);
 extern int convbool(PyObject *, void *);
 extern PyObject *abstract_pynew(PyTypeObject *, PyObject *, PyObject *);
 extern PyObject *getbool(int);
-#define DECL_GETU_(n) extern PyObject *getu##n(uint##n);
-DOUINTSZ(DECL_GETU_)
+extern PyObject *getulong(unsigned long);
 extern void *newtype(PyTypeObject *, const PyTypeObject *, const char *);
 
 extern PyObject * mkexc(PyObject *, PyObject *, const char *, PyMethodDef *);
@@ -256,22 +260,26 @@ extern PyMethodDef *donemethods(void);
 #define GMAP_KWMETHDECL(func, doc)					\
   extern PyObject *gmapmeth_##func(PyObject *, PyObject *, PyObject *);
 
-#define GMAP_DOMETHODS(METH, KWMETH)					\
+#define GMAP_DOROMETHODS(METH, KWMETH)					\
   METH	(has_key,	"D.has_key(KEY) -> BOOL")			\
   METH	(keys,		"D.keys() -> LIST")				\
   METH	(values,	"D.values() -> LIST")				\
   METH	(items,		"D.items() -> LIST")				\
   METH	(iterkeys,	"D.iterkeys() -> ITER")				\
   METH	(itervalues,	"D.itervalues() -> ITER")			\
-  METH	(iteritems, 	"D.iteritems() -> ITER")			\
-  METH	(clear,		"D.clear()")					\
+  METH	(iteritems,	"D.iteritems() -> ITER")			\
   KWMETH(get,		"D.get(KEY, [default = None]) -> VALUE")	\
+
+#define GMAP_DOMETHODS(METH, KWMETH)					\
+  GMAP_DOROMETHODS(METH, KWMETH)					\
+  METH	(clear,		"D.clear()")					\
   KWMETH(setdefault,	"D.setdefault(K, [default = None]) -> VALUE")	\
   KWMETH(pop,		"D.pop(KEY, [default = <error>]) -> VALUE")	\
   METH	(popitem,	"D.popitem() -> (KEY, VALUE)")			\
   METH	(update,	"D.update(MAP)")
 
 GMAP_DOMETHODS(GMAP_METHDECL, GMAP_KWMETHDECL)
+#define GMAP_ROMETHODS GMAP_DOROMETHODS(GMAP_METH, GMAP_KWMETH)
 #define GMAP_METHODS GMAP_DOMETHODS(GMAP_METH, GMAP_KWMETH)
 extern int gmap_pysize(PyObject *);
 extern PySequenceMethods gmap_pysequence;
@@ -296,8 +304,8 @@ extern PyTypeObject *gf_pytype;
 #define MP_PYCHECK(o) PyObject_TypeCheck((o), mp_pytype)
 #define GF_PYCHECK(o) PyObject_TypeCheck((o), gf_pytype)
 
-extern mp *mp_frompylong(PyLongObject *);
-extern PyLongObject *mp_topylong(mp *);
+extern mp *mp_frompylong(PyObject *);
+extern PyObject *mp_topylong(mp *);
 extern mp *tomp(PyObject *);
 extern mp *getmp(PyObject *);
 extern int convmp(PyObject *, void *);
@@ -330,7 +338,7 @@ typedef struct fe_pyobj {
   field *f;
   mp *x;
 } fe_pyobj;
-      
+
 extern PyTypeObject *field_pytype;
 extern PyTypeObject *primefield_pytype;
 extern PyTypeObject *niceprimefield_pytype;
@@ -386,7 +394,7 @@ typedef struct ecinfo_pyobj {
   ec_info ei;
   PyObject *cobj;
 } ecinfo_pyobj;
-      
+
 extern PyTypeObject *ecinfo_pytype;
 #define ECINFO_PYCHECK(o) PyObject_TypeCheck((o), ecinfo_pytype)
 #define ECINFO_EI(o) (&((ecinfo_pyobj *)(o))->ei)
@@ -552,7 +560,7 @@ extern PyObject *gmac_pywrap(PyObject *, gmac *, unsigned);
 extern int convgmac(PyObject *, void *);
 
 /*----- Key generation ----------------------------------------------------*/
-    
+
 typedef struct pfilt_pyobj {
   PyObject_HEAD
   pfilt f;