From: Sergio Durigan Junior <sergio.durigan@canonical.com>
Date: Wed, 20 Sep 2023 16:26:18 -0400
Subject: Adjust HAVE_STRLCPY macro check

When strlcpy exists, the HAVE_STRLCPY will have an empty value which
breaks the "!HAVE_STRLCPY" check.

Forwarded: yes, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052360
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052360
---
 src/meta.cc | 2 +-
 src/meta.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/meta.cc b/src/meta.cc
index 9a2053f..e133f91 100644
--- a/src/meta.cc
+++ b/src/meta.cc
@@ -831,7 +831,7 @@ bool scaseequals(string_view a, string_view b)
     return true;
 }
 
-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY
+#if !defined(HAVE_STRLCPY) || !(HAVE_STRLCPY + 0)
 size_t strlcpy(char *tgt, const char *src, size_t tgtSize)
 {
     auto p = src;
diff --git a/src/meta.h b/src/meta.h
index a1f4080..8f22c83 100644
--- a/src/meta.h
+++ b/src/meta.h
@@ -323,7 +323,7 @@ class NoCaseStringMap : public std::map<mstring, mstring, ltstring>
 static constexpr string_view svRN = szRN;
 static constexpr string_view svLF = "\n";
 
-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY
+#if !defined(HAVE_STRLCPY) || !(HAVE_STRLCPY + 0)
 size_t strlcpy(char *tgt, const char *src, size_t tgtSize);
 #endif
 }