aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/include/nc_alloc.h
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2008-11-15 09:23:48 +0000
committerRong-En Fan <rafan@FreeBSD.org>2008-11-15 09:23:48 +0000
commit5d08fb1f777aa988958a4f0c45887b0cbfaef9a0 (patch)
treeb736f10477d660dd3f6822f50c28f2899139567c /contrib/ncurses/include/nc_alloc.h
parent92bf2d25616b75a9cf3fd58652df147b3cf284ad (diff)
parent6181f4622a00a9de81df01cecb5fa73ffdb697bc (diff)
downloadsrc-5d08fb1f777aa988958a4f0c45887b0cbfaef9a0.tar.gz
src-5d08fb1f777aa988958a4f0c45887b0cbfaef9a0.zip
- Update ncurses to 5.7-20081102 (5.7 release) and build glue
- This also removes $FreeBSD$ from two now unmodifed source files ncurses/tinfo/lib_raw.c and ncurses/tinfo/lib_baudrate.c MFC after: 2 months (after 7.1 and 6.4 are released)
Notes
Notes: svn path=/head/; revision=184989
Diffstat (limited to 'contrib/ncurses/include/nc_alloc.h')
-rw-r--r--contrib/ncurses/include/nc_alloc.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/ncurses/include/nc_alloc.h b/contrib/ncurses/include/nc_alloc.h
index 9b5751de8c1f..f521bffe9f0a 100644
--- a/contrib/ncurses/include/nc_alloc.h
+++ b/contrib/ncurses/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 <dickey@clark.net> 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 <string.h>
+#undef strndup /* workaround for #define in GLIBC 2.7 */
#include <dmalloc.h> /* Gray Watson's library */
#else
#undef HAVE_LIBDMALLOC