From: Olivier Houchard <cognet@ci0.org>
Date: Fri, 20 Mar 2020 10:41:24 +0000 (+0100)
Subject: BUILD/MEDIUM: fd: Declare fd_mig_lock as extern.
X-Git-Tag: v2.2-dev5~12
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=ad91124bcfac932140273840a2985e4ac5d5c400;p=haproxy-3.0.git

BUILD/MEDIUM: fd: Declare fd_mig_lock as extern.

Declare fd_mig_lock as extern so that it isn't defined multiple times.
This should fix build for architectures without double-width CAS.
---

diff --git a/include/proto/fd.h b/include/proto/fd.h
index 8fa7670..9783f90 100644
--- a/include/proto/fd.h
+++ b/include/proto/fd.h
@@ -67,7 +67,7 @@ void fd_remove(int fd);
 int fd_takeover(int fd, void *expected_owner);
 
 #ifndef HA_HAVE_CAS_DW
-__decl_hathreads(HA_RWLOCK_T fd_mig_lock);
+__decl_hathreads(extern HA_RWLOCK_T fd_mig_lock);
 #endif
 
 ssize_t fd_write_frag_line(int fd, size_t maxlen, const struct ist pfx[], size_t npfx, const struct ist msg[], size_t nmsg, int nl);