From: David CARLIER <devnexen@gmail.com>
Date: Thu, 17 Feb 2022 12:18:13 +0000 (+0000)
Subject: Fix build on Illumos (#983)
X-Git-Tag: SQUID_6_0_1~233
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=460fd23260cd440c23a5685f8d7496b37c1121c7;p=thirdparty%2Fsquid.git

Fix build on Illumos (#983)
---

diff --git a/src/auth/basic/LDAP/basic_ldap_auth.cc b/src/auth/basic/LDAP/basic_ldap_auth.cc
index 407585a46a..f383d14788 100644
--- a/src/auth/basic/LDAP/basic_ldap_auth.cc
+++ b/src/auth/basic/LDAP/basic_ldap_auth.cc
@@ -134,6 +134,10 @@ PFldap_start_tls_s Win32_ldap_start_tls_s;
 #include <lber.h>
 #include <ldap.h>
 
+#ifndef LDAP_SECURITY_ERROR
+#define LDAP_SECURITY_ERROR(err) (0x2f <= (err) && (err) <= 0x32) // [47, 50]
+#endif
+
 #endif
 
 #define PROGRAM_NAME "basic_ldap_auth"
diff --git a/src/base/File.cc b/src/base/File.cc
index 458ca560eb..c2c7ec574b 100644
--- a/src/base/File.cc
+++ b/src/base/File.cc
@@ -107,7 +107,7 @@ FileOpeningConfig::createdIfMissing()
 // nothing better on Solaris, but do not be tempted to use this elsewhere. For
 // more info, see http://bugs.squid-cache.org/show_bug.cgi?id=4212#c14
 /// fcntl(... struct flock) convenience wrapper
-int
+static int
 fcntlLock(const int fd, const short lockType)
 {
     // the exact composition and order of flock data members is unknown!