libcompat: Declare strnlen() prototype in compat.h

Remove now unused strnlen.h header.

lib/compat/Makefile.am

@@ -28,7 +28,7 @@ libcompat_a_SOURCES += obstack.c obstack.h
 endif
 
 if !HAVE_STRNLEN
-libcompat_a_SOURCES += strnlen.c strnlen.h
+libcompat_a_SOURCES += strnlen.c
 endif
 
 if !HAVE_STRNDUP

lib/compat/compat.h

@@ -51,8 +51,6 @@ extern "C" {
 #define va_copy(dest, src) memcpy(&(dest), &(src), sizeof(va_list))
 #endif
 
-#include <strnlen.h>
-
 #ifndef HAVE_C99_SNPRINTF
 #include <stddef.h>
 #include <stdarg.h>
@@ -68,6 +66,10 @@ int asprintf(char **str, char const *fmt, ...);
 int vasprintf(char **str, const char *fmt, va_list args);
 #endif
 
+#ifndef HAVE_STRNLEN
+size_t strnlen(const char *s, size_t n);
+#endif
+
 #ifndef HAVE_STRNDUP
 #include <stddef.h>
 

lib/compat/strnlen.c

@@ -20,7 +20,7 @@
 # include <config.h>
 #endif
 
-#include "strnlen.h"
+#include "compat.h"
 
 /* Find the length of STRING, but scan at most MAXLEN characters.
    If no '\0' terminator is found in that many characters, return MAXLEN.  */

lib/compat/strnlen.h

@@ -1,32 +0,0 @@
-/* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 2005 Free Software Foundation, Inc.
-   Written by Simon Josefsson.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef STRNLEN_H
-#define STRNLEN_H
-
-/* Get strnlen declaration, if available.  */
-#include <string.h>
-
-#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN
-/* Find the length (number of bytes) of STRING, but scan at most
-   MAXLEN bytes.  If no '\0' terminator is found in that many bytes,
-   return MAXLEN.  */
-extern size_t strnlen(const char *string, size_t maxlen);
-#endif
-
-#endif /* STRNLEN_H */