diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-02-28 19:18:07 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-02-28 19:18:07 +0000 |
| commit | a0044ffc69cfe39a3b0b2d208e0952254555afc6 (patch) | |
| tree | 7b2d708d03277cdd2560e9ce6572bdafc2e58bab /include/nc_alloc.h | |
| parent | 4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (diff) | |
Notes
Diffstat (limited to 'include/nc_alloc.h')
| -rw-r--r-- | include/nc_alloc.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/include/nc_alloc.h b/include/nc_alloc.h index f521bffe9f0a..da70906f552f 100644 --- a/include/nc_alloc.h +++ b/include/nc_alloc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * + * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,7 +29,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: nc_alloc.h,v 1.16 2008/09/27 22:30:33 tom Exp $ */ +/* $Id: nc_alloc.h,v 1.18 2010/11/20 22:59:49 tom Exp $ */ #ifndef NC_ALLOC_included #define NC_ALLOC_included 1 @@ -38,7 +38,7 @@ extern "C" { #endif -#if HAVE_LIBDMALLOC +#if defined(HAVE_LIBDMALLOC) && HAVE_LIBDMALLOC #include <string.h> #undef strndup /* workaround for #define in GLIBC 2.7 */ #include <dmalloc.h> /* Gray Watson's library */ @@ -47,14 +47,14 @@ extern "C" { #define HAVE_LIBDMALLOC 0 #endif -#if HAVE_LIBDBMALLOC +#if defined(HAVE_LIBDBMALLOC) && HAVE_LIBDBMALLOC #include <dbmalloc.h> /* Conor Cahill's library */ #else #undef HAVE_LIBDBMALLOC #define HAVE_LIBDBMALLOC 0 #endif -#if HAVE_LIBMPATROL +#if defined(HAVE_LIBMPATROL) && HAVE_LIBMPATROL #include <mpatrol.h> /* Memory-Patrol library */ #else #undef HAVE_LIBMPATROL @@ -74,9 +74,15 @@ extern NCURSES_EXPORT(void) _nc_free_tic(int) GCC_NORETURN; extern NCURSES_EXPORT(void) _nc_free_tparm(void); extern NCURSES_EXPORT(void) _nc_leaks_dump_entry(void); extern NCURSES_EXPORT(void) _nc_leaks_tic(void); -#define ExitProgram(code) _nc_free_and_exit(code) + +#if NCURSES_SP_FUNCS +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_free_and_exit)(SCREEN*, int) GCC_NORETURN; #endif +#define ExitProgram(code) _nc_free_and_exit(code) + +#endif /* NO_LEAKS, etc */ + #ifndef HAVE_NC_FREEALL #define HAVE_NC_FREEALL 0 #endif |