X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fyaz%2Fxmalloc.h;h=60ef839c698edd9de5c22f86c213698e3b79d20e;hb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;hp=ae159d1b875a2029ae034be027630cfa1137ae1c;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/include/yaz/xmalloc.h b/include/yaz/xmalloc.h
index ae159d1..60ef839 100644
--- a/include/yaz/xmalloc.h
+++ b/include/yaz/xmalloc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1999, 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,71 +23,21 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Log: xmalloc.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.6  1999/07/13 13:24:53  adam
- * Updated memory debugging memory allocatation routines.
- *
- * Revision 1.5  1998/07/20 12:36:22  adam
- * Minor changes.
- *
- * Revision 1.4  1997/10/31 12:20:08  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.
- *
- * Revision 1.3  1997/09/01 08:49:54  adam
- * New windows NT/95 port using MSV5.0. To export DLL functions the
- * YAZ_EXPORT modifier was added. Defined in yconfig.h.
- *
- * Revision 1.2  1997/05/14 06:53:53  adam
- * C++ support.
- *
- * Revision 1.1  1995/11/01 11:55:41  quinn
- * Added xmalloc.c
- *
- * Revision 1.8  1995/10/16  14:03:07  quinn
- * Changes to support element set names and espec1
- *
- * Revision 1.7  1994/10/05  10:15:18  quinn
- * Added xrealloc.
- *
- * Revision 1.6  1994/09/26  16:31:24  adam
- * Minor changes. xmalloc declares xcalloc now.
- *
- * Revision 1.5  1994/09/19  15:46:34  quinn
- * Added stdlib.h
- *
- * Revision 1.4  1994/08/18  08:22:27  adam
- * Res.h modified. xmalloc now declares xstrdup.
- *
- * Revision 1.3  1994/08/17  15:34:15  adam
- * Initial version of resource manager.
- *
- * Revision 1.2  1994/08/17  14:09:48  quinn
- * Small changes
- *
- * Revision 1.1  1994/08/17  13:39:07  adam
- * Added xmalloc header.
- *
- * Revision 1.1  1994/08/16  16:16:02  adam
- * bfile header created.
- *
+ * $Id: xmalloc.h,v 1.7 2005-06-25 15:46:03 adam Exp $
+ */
+/**
+ * \file xmalloc.h
+ * \brief Header for malloc interface.
  */
 
 #ifndef XMALLOC_H
 #define XMALLOC_H
 
-#include <sys/types.h>
-#include <stdlib.h>
+#include <stddef.h>
 
 #include <yaz/yconfig.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 #define xrealloc(o, x) xrealloc_f(o, x, __FILE__, __LINE__)
 #define xmalloc(x) xmalloc_f(x, __FILE__, __LINE__)
@@ -99,13 +49,19 @@ extern "C" {
 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);
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+