X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fxmalloc.h;h=a8ea211eac8331822db3352969826960ffc9a668;hb=18cc954000e6b33d2316faea946f0576602b60f3;hp=4d8af51de74f26e5840147073fa1b67ca99a3727;hpb=b6a465d196c8738156814a9fb3ba9e2450dd1be4;p=yaz-moved-to-github.git diff --git a/include/xmalloc.h b/include/xmalloc.h index 4d8af51..a8ea211 100644 --- a/include/xmalloc.h +++ b/include/xmalloc.h @@ -24,7 +24,14 @@ * OF THIS SOFTWARE. * * $Log: xmalloc.h,v $ - * Revision 1.1 1995-11-01 11:55:41 quinn + * 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 @@ -62,11 +69,17 @@ #include #include -void *xrealloc_f (void *o, size_t size, char *file, int line); -void *xmalloc_f (size_t size, char *file, int line); -void *xcalloc_f (size_t nmemb, size_t size, char *file, int line); -char *xstrdup_f (const char *, char *file, int line); -void xfree_f (void *p, char *file, int line); +#include + +#ifdef __cplusplus +extern "C" { +#endif + +YAZ_EXPORT void *xrealloc_f (void *o, size_t size, char *file, int line); +YAZ_EXPORT void *xmalloc_f (size_t size, char *file, int line); +YAZ_EXPORT void *xcalloc_f (size_t nmemb, size_t size, char *file, int line); +YAZ_EXPORT char *xstrdup_f (const char *, char *file, int line); +YAZ_EXPORT void xfree_f (void *p, char *file, int line); #define xrealloc(o, x) xrealloc_f(o, x, __FILE__, __LINE__) #define xmalloc(x) xmalloc_f(x, __FILE__, __LINE__) @@ -74,4 +87,8 @@ void xfree_f (void *p, char *file, int line); #define xfree(x) xfree_f(x, __FILE__, __LINE__) #define xstrdup(s) xstrdup_f(s, __FILE__, __LINE__) +#ifdef __cplusplus +} +#endif + #endif