From 6181f4622a00a9de81df01cecb5fa73ffdb697bc Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Sun, 9 Nov 2008 14:08:54 +0000 Subject: - Import ncurses 5.7-20081102 (5.7 release) onto vendor branch --- include/nc_alloc.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include/nc_alloc.h') diff --git a/include/nc_alloc.h b/include/nc_alloc.h index 9b5751de8c1f..f521bffe9f0a 100644 --- a/include/nc_alloc.h +++ b/include/nc_alloc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,2008 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 * @@ -27,9 +27,9 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 1996,1997 * + * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: nc_alloc.h,v 1.15 2007/02/03 18:40:23 tom Exp $ */ +/* $Id: nc_alloc.h,v 1.16 2008/09/27 22:30:33 tom Exp $ */ #ifndef NC_ALLOC_included #define NC_ALLOC_included 1 @@ -39,6 +39,8 @@ extern "C" { #endif #if HAVE_LIBDMALLOC +#include +#undef strndup /* workaround for #define in GLIBC 2.7 */ #include /* Gray Watson's library */ #else #undef HAVE_LIBDMALLOC -- cgit v1.3