X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=include%2Fnc_alloc.h;h=8bf6dcc73d5d79e0fafe612e2a67dbc40907abfa;hb=46722468f47c2b77b3987729b4bcf2321cccfd01;hp=54a706e142852ccd468be036f9f3dbc26be19017;hpb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1;p=ncurses.git

diff --git a/include/nc_alloc.h b/include/nc_alloc.h
index 54a706e1..8bf6dcc7 100644
--- a/include/nc_alloc.h
+++ b/include/nc_alloc.h
@@ -29,11 +29,15 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey <dickey@clark.net> 1996,1997                   *
  ****************************************************************************/
-/* $Id: nc_alloc.h,v 1.5 1998/02/11 12:13:45 tom Exp $ */
+/* $Id: nc_alloc.h,v 1.11 2002/07/20 13:16:40 tom Exp $ */
 
 #ifndef NC_ALLOC_included
 #define NC_ALLOC_included 1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if HAVE_LIBDMALLOC
 #include <dmalloc.h>    /* Gray Watson's library */
 #else
@@ -52,21 +56,36 @@
 #define NO_LEAKS 0
 #endif
 
-#ifndef HAVE_NC_FREEALL
-#define HAVE_NC_FREEALL 0
-#endif
-
-#if HAVE_LIBDBMALLOC || HAVE_LIBDMALLOC || NO_LEAKS || HAVE_NC_FREEALL
+#if HAVE_LIBDBMALLOC || HAVE_LIBDMALLOC || NO_LEAKS
+#define HAVE_NC_FREEALL 1
 struct termtype;
 extern void _nc_free_and_exit(int) GCC_NORETURN;
 extern void _nc_free_tparm(void);
 extern void _nc_leaks_dump_entry(void);
-extern void _nc_free_termtype(struct termtype *, int);
 #define ExitProgram(code) _nc_free_and_exit(code)
 #endif
 
+#ifndef HAVE_NC_FREEALL
+#define HAVE_NC_FREEALL 0
+#endif
+
 #ifndef ExitProgram
-#define ExitProgram(code) return code
+#define ExitProgram(code) exit(code)
+#endif
+
+/* doalloc.c */
+extern NCURSES_EXPORT(void *) _nc_doalloc(void *, size_t);
+#if !HAVE_STRDUP
+#define strdup _nc_strdup
+extern NCURSES_EXPORT(char *) _nc_strdup(const char *);
+#endif
+
+#define typeMalloc(type,elts) (type *)malloc((elts)*sizeof(type))
+#define typeCalloc(type,elts) (type *)calloc((elts),sizeof(type))
+#define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (elts)*sizeof(type))
+
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* NC_ALLOC_included */