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 407585a46a2130cf5124608901045283886259fc..f383d147885b74aead10fbda864cbcb31f05a43f 100644 (file)
--- 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 458ca560eb9362c6455e52ca680deea87b505265..c2c7ec574ba768ed0d428fe2abfcff32f1abb2a2 100644 (file)
--- 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!