projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make Variant-1 OID definition. Fix OID for Espec-1
[yaz-moved-to-github.git]
/
src
/
nmem.c
diff --git
a/src/nmem.c
b/src/nmem.c
index
b76c555
..
ce08d99
100644
(file)
--- a/
src/nmem.c
+++ b/
src/nmem.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: nmem.c,v 1.26 2006-12-13 15:28:28 adam Exp $
+ * $Id: nmem.c,v 1.29 2007-04-12 13:52:57 adam Exp $
*/
/**
*/
/**
@@
-27,7
+27,6
@@
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
-#include <yaz/oid.h>
#ifdef WIN32
#include <windows.h>
#ifdef WIN32
#include <windows.h>
@@
-182,7
+181,7
@@
static int nmem_active_no = 0;
static int nmem_init_flag = 0;
/** \brief whether nmem blocks should be reassigned to heap */
static int nmem_init_flag = 0;
/** \brief whether nmem blocks should be reassigned to heap */
-static int nmem_release_in_heap = 1;
+static int nmem_release_in_heap = 0;
#if NMEM_DEBUG
struct nmem_debug_info {
#if NMEM_DEBUG
struct nmem_debug_info {
@@
-499,7
+498,6
@@
void nmem_exit (void)
{
if (--nmem_init_flag == 0)
{
{
if (--nmem_init_flag == 0)
{
- oid_exit();
while (freelist)
{
struct nmem_block *fl = freelist;
while (freelist)
{
struct nmem_block *fl = freelist;