Function nmem_exit calls oid_exit (when reference is 0).

[yaz-moved-to-github.git] / util / nmem.c

diff --git a/util/nmem.c b/util/nmem.c
index d337d3f..ceb8210 100644 (file)
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.25  2001-06-26 14:11:27  adam
+ * Revision 1.27  2001-09-27 12:09:18  adam
+ * Function nmem_exit calls oid_exit (when reference is 0).
+ *
+ * Revision 1.26  2001/07/19 19:51:42  adam
+ * Added typecasts to make C++ happy.
+ *
+ * Revision 1.25  2001/06/26 14:11:27  adam
  * Added MUTEX functions for NMEM module (used by OID utility).
  *
  * Revision 1.24  2000/05/11 14:37:55  adam
@@ -101,6 +107,7 @@
 #include <yaz/xmalloc.h>
 #include <yaz/nmem.h>
 #include <yaz/log.h>
+#include <yaz/oid.h>
 #ifdef WIN32
 #include <windows.h>
 #elif _REENTRANT
@@ -144,7 +151,7 @@ YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *p)
     NMEM_ENTER;
     if (!*p)
     {
-       *p = malloc (sizeof(**p));
+       *p = (NMEM_MUTEX) malloc (sizeof(**p));
 #ifdef WIN32
        InitializeCriticalSection(&(*p)->m_handle);
 #elif _REENTRANT
@@ -462,6 +469,7 @@ void nmem_exit (void)
 {
     if (--nmem_init_flag == 0)
     {
+        oid_exit();
        while (freelist)
        {
            struct nmem_block *fl = freelist;