X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=59e2282636dd200b00054b981ed5b6e169cc533a;hb=ee171c36f5db3f64d42b840c247ac33f056d656d;hp=61fe86237984064174ec078fc8b48cdc8a2ca0c1;hpb=b440dce0831a72bebe4f4821ab7771cc05e8facb;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index 61fe862..59e2282 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2000, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.18  1999-08-27 09:40:32  adam
+ * Revision 1.21  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.20  2000/01/06 14:59:13  adam
+ * Added oid_init/oid_exit. Changed oid_exit.
+ *
+ * Revision 1.19  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.18  1999/08/27 09:40:32  adam
  * Renamed logf function to yaz_log. Removed VC++ project files.
  *
  * Revision 1.17  1999/07/13 13:28:25  adam
@@ -71,12 +80,15 @@
  * This is a simple and fairly wasteful little module for nibble memory
  * allocation. Evemtually we'll put in something better.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <assert.h>
 #include <string.h>
-#include <xmalloc.h>
-#include <nmem.h>
-#include <log.h>
+#include <yaz/xmalloc.h>
+#include <yaz/nmem.h>
+#include <yaz/log.h>
 #ifdef WIN32
 #include <windows.h>
 #elif _REENTRANT
@@ -382,6 +394,7 @@ void nmem_exit (void)
 	cfreelist = cfreelist->next;
 	xfree (cfl);
     }
+    nmem_init_flag = 0;
 #ifdef WIN32
     DeleteCriticalSection(&critical_section);
 #endif