X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fnmem.h;h=44d1cf85287ebb2f5a329bd2bf348a75b6ee91f7;hb=7057699040b614f56be178f3672b4a2b95301d5f;hp=18ff8ad76d8398ab26dc8b74549b64e388f11f26;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h index 18ff8ad..44d1cf8 100644 --- a/include/yaz/nmem.h +++ b/include/yaz/nmem.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1998, Index Data. + * Copyright (c) 1995-2001, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -24,7 +24,19 @@ * OF THIS SOFTWARE. * * $Log: nmem.h,v $ - * Revision 1.1 1999-11-30 13:47:11 adam + * Revision 1.5 2001-03-25 21:55:12 adam + * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. + * + * Revision 1.4 2000/05/09 11:48:58 adam + * Fix (bug introduced by previous commit). + * + * Revision 1.3 2000/05/09 10:55:05 adam + * Public nmem_print_list (for debugging). + * + * Revision 1.2 2000/02/28 11:20:06 adam + * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL. + * + * Revision 1.1 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.10 1998/10/19 15:24:20 adam @@ -54,9 +66,7 @@ #define NMEM_DEBUG 0 #endif -#ifdef __cplusplus -extern "C" { -#endif +YAZ_BEGIN_CDECL typedef struct nmem_block { @@ -78,6 +88,7 @@ typedef struct nmem_control *NMEM; YAZ_EXPORT void nmem_reset(NMEM n); YAZ_EXPORT int nmem_total(NMEM n); YAZ_EXPORT char *nmem_strdup (NMEM mem, const char *src); +YAZ_EXPORT int *nmem_intdup (NMEM mem, int v); YAZ_EXPORT void nmem_transfer (NMEM dst, NMEM src); YAZ_EXPORT void nmem_critical_enter (void); @@ -92,18 +103,21 @@ YAZ_EXPORT void *nmem_malloc_f(const char *file, int line, NMEM n, int size); #define nmem_destroy(x) nmem_destroy_f(__FILE__, __LINE__, (x)) #define nmem_malloc(x, y) nmem_malloc_f(__FILE__, __LINE__, (x), (y)) +YAZ_EXPORT void nmem_print_list (void); + #else YAZ_EXPORT NMEM nmem_create(void); YAZ_EXPORT void nmem_destroy(NMEM n); YAZ_EXPORT void *nmem_malloc(NMEM n, int size); +#define nmem_print_list() + #endif YAZ_EXPORT void nmem_init (void); YAZ_EXPORT void nmem_exit (void); -#ifdef __cplusplus -} -#endif + +YAZ_END_CDECL #endif