From 84600df21d81d6572fdf12735ea636cf4f6507bd Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 11 Jun 2014 17:56:17 +0000 Subject: merge from gcc --- include/ChangeLog | 6 ++++++ include/libiberty.h | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 99a3069..8c76d66 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2014-06-10 Thomas Schwinge + + PR lto/61334 + * libiberty.h [defined (HAVE_DECL_STRNLEN) && + !HAVE_DECL_STRNLEN] (strnlen): New prototype. + 2014-05-21 John Marino * liberty.h: Use basename function on DragonFly. diff --git a/include/libiberty.h b/include/libiberty.h index 7fd0703..56b8b43 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -636,6 +636,10 @@ extern int snprintf (char *, size_t, const char *, ...) ATTRIBUTE_PRINTF_3; extern int vsnprintf (char *, size_t, const char *, va_list) ATTRIBUTE_PRINTF(3,0); #endif +#if defined (HAVE_DECL_STRNLEN) && !HAVE_DECL_STRNLEN +extern size_t strnlen (const char *, size_t); +#endif + #if defined(HAVE_DECL_STRVERSCMP) && !HAVE_DECL_STRVERSCMP /* Compare version strings. */ extern int strverscmp (const char *, const char *); -- cgit v1.1