Check if memmem is declared in system headers.

If the system (or one of the dependencies) implements memmem but does
not define the header, we would not declare it either resulting in
compiler warnings.  Check for declaration explicitly.  bz#3102.

diff --git a/configure.ac b/configure.ac
index a12fc0d1225c7d62d44c0dec5ec4db8e2cd0fdf7..6e70e52c3bac598e859210f99e316ae4adcb1757 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1873,7 +1873,7 @@ AC_CHECK_FUNCS([ \
        warn \
 ])
 
-AC_CHECK_DECLS([bzero])
+AC_CHECK_DECLS([bzero, memmem])
 
 dnl Wide character support.
 AC_CHECK_FUNCS([mblen mbtowc nl_langinfo wcwidth])

diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index afe882f92e1d40e879b48bc129ee5f45f6509c6d..8c97173b1c86ccfa529407a2d7104e95a2dbecff 100644 (file)
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -74,7 +74,7 @@ int getpagesize(void);
 char *getcwd(char *pt, size_t size);
 #endif
 
-#ifndef HAVE_MEMMEM
+#if defined(HAVE_DECL_MEMMEM) && HAVE_DECL_MEMMEM == 0
 void *memmem(const void *, size_t, const void *, size_t);
 #endif