X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=99d22cdc86163142c4f631f9e40e522dbde5cfc7;hb=3e506bbbebc55bd870aaf2be4d0014cec0779851;hp=ea9a9b88a73c528b4820e7743ecf10592d7ff878;hpb=068a5a7412f492019b4d6f5e89158098d44368f7;p=yaz-moved-to-github.git diff --git a/util/nmem.c b/util/nmem.c index ea9a9b8..99d22cd 100644 --- a/util/nmem.c +++ b/util/nmem.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: nmem.c,v $ - * Revision 1.6 1997-10-31 12:20:09 adam + * Revision 1.7 1998-02-11 11:53:36 adam + * Changed code so that it compiles as C++. + * + * Revision 1.6 1997/10/31 12:20:09 adam * Improved memory debugging for xmalloc/nmem.c. References to NMEM * instead of ODR in n ESPEC-1 handling in source d1_espec.c. * Bug fix: missing fclose in data1_read_espec1. @@ -82,8 +85,8 @@ static nmem_block *get_block(int size) if (get < size) get = size; - r = xmalloc(sizeof(*r)); - r->buf = xmalloc(r->size = get); + r = (nmem_block *)xmalloc(sizeof(*r)); + r->buf = (char *)xmalloc(r->size = get); } r->top = 0; return r; @@ -148,7 +151,7 @@ NMEM nmem_create(void) if (r) cfreelist = cfreelist->next; else - r = xmalloc(sizeof(*r)); + r = (nmem_control *)xmalloc(sizeof(*r)); NMEM_LEAVE; #if NMEM_DEBUG