util.c: Replace mLib `DISCARD' with a plain `(void)' cast.

[pyke] / catacomb-python.h

diff --git a/catacomb-python.h b/catacomb-python.h
index b0f933a9cdeb44d5dc6358802ce822f6216eaae4..85adf7d1748090dc6b72616588130b9d8e8446e6 100644 (file)
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -39,7 +39,6 @@
 #include <longintrepr.h>
 #include <structmember.h>
 
 #include <longintrepr.h>
 #include <structmember.h>
 

-#include <mLib/darray.h>

 #include <mLib/dstr.h>
 #include <mLib/macros.h>
 #include <mLib/quis.h>
 #include <mLib/dstr.h>
 #include <mLib/macros.h>
 #include <mLib/quis.h>


@@ -176,11 +175,6 @@ PRIVATE_SYMBOLS;
     return (0);                                                                \
   }
 
     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_META(ty, base, meta) do {                             \
 #define root_pytype 0
 #define type_pytype &PyType_Type
 #define INITTYPE_META(ty, base, meta) do {                             \


@@ -190,6 +184,7 @@ PRIVATE_SYMBOLS;
 #define INITTYPE(ty, base) INITTYPE_META(ty, base, type)
 
 extern PyObject *home_module;
 #define INITTYPE(ty, base) INITTYPE_META(ty, base, type)
 
 extern PyObject *home_module;

+extern PyObject *modname;

 
 #define INSERT(name, ob) do {  \
   PyObject *_o = (PyObject *)(ob);                                     \
 
 #define INSERT(name, ob) do {  \
   PyObject *_o = (PyObject *)(ob);                                     \