X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fxmalloc.h;h=60ef839c698edd9de5c22f86c213698e3b79d20e;hb=9dfcbb70828f8d5b524c9bb45852246ae1dd6878;hp=0aa8768a4ecf3368fb33ff6eeeee9490dca096c1;hpb=05c274ef315384faafcc5900c17468f0ea2474e6;p=yaz-moved-to-github.git diff --git a/include/yaz/xmalloc.h b/include/yaz/xmalloc.h index 0aa8768..60ef839 100644 --- a/include/yaz/xmalloc.h +++ b/include/yaz/xmalloc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2004, Index Data. + * Copyright (C) 1995-2005, Index Data ApS * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: xmalloc.h,v 1.4 2004-10-15 00:18:59 adam Exp $ + * $Id: xmalloc.h,v 1.7 2005-06-25 15:46:03 adam Exp $ */ /** * \file xmalloc.h @@ -33,8 +33,7 @@ #ifndef XMALLOC_H #define XMALLOC_H -#include -#include +#include #include @@ -50,7 +49,7 @@ YAZ_BEGIN_CDECL YAZ_EXPORT void *xrealloc_f (void *o, size_t size, const char *file, int line); YAZ_EXPORT void *xmalloc_f (size_t size, const char *file, int line); YAZ_EXPORT void *xcalloc_f (size_t nmemb, size_t size, - const char *file, int line); + const char *file, int line); YAZ_EXPORT char *xstrdup_f (const char *p, const char *file, int line); YAZ_EXPORT void xfree_f (void *p, const char *file, int line); YAZ_EXPORT void xmalloc_trav_f(const char *s, const char *file, int line); @@ -58,3 +57,11 @@ YAZ_EXPORT void xmalloc_trav_f(const char *s, const char *file, int line); YAZ_END_CDECL #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +