2 files changed, 3 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index b689db4b5..7094d470d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1986,10 +1986,11 @@ AC_CHECK_DECL([tcsendbreak],
 
 AC_CHECK_DECLS([h_errno], , ,[#include <netdb.h>])
 
-AC_CHECK_DECLS([SHUT_RD], , ,
+AC_CHECK_DECLS([SHUT_RD, getpeereid], , ,
         [
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <unistd.h>
         ])
 
 AC_CHECK_DECLS([O_NONBLOCK], , ,
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 4a16702ef..e5fd6f5bb 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -197,7 +197,7 @@ int writev(int, struct iovec *, int);
 #include "bsd-waitpid.h"
 #include "bsd-poll.h"
 
-#ifndef HAVE_GETPEEREID
+#if defined(HAVE_DECL_GETPEEREID) && HAVE_DECL_GETPEEREID == 0
 int getpeereid(int , uid_t *, gid_t *);
 #endif