From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 11 Dec 2019 02:22:06 +0000 (+1100)
Subject: Check if memmem is declared in system headers.
X-Git-Tag: V_8_2_P1~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afffd310360b155df2133d1f5f1ab2f4e939b570;p=thirdparty%2Fopenssh-portable.git

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 a12fc0d12..6e70e52c3 100644
--- 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 afe882f92..8c97173b1 100644
--- 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