From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 14 Jul 2022 10:31:21 +0000 (+0200)
Subject: src/lxc/log.h: fix STRERROR_R_CHAR_P
X-Git-Tag: lxc-5.0.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2ee9b440c92ad2367898c009b8eac30d9a37770;p=thirdparty%2Flxc.git

src/lxc/log.h: fix STRERROR_R_CHAR_P

STRERROR_R_CHAR_P is always defined to 0 or 1 depending on the value of
have_func_strerror_r_char_p in meson.build so replace #ifdef by #if to
avoid a redefinition build failure if char *strerror_r is not defined

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 554a2e1d4..fcddc679a 100644
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -304,13 +304,13 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,	\
  * Helper macro to define errno string.
  */
 #if HAVE_STRERROR_R
-	#ifdef STRERROR_R_CHAR_P
+	#if STRERROR_R_CHAR_P
 	char *strerror_r(int errnum, char *buf, size_t buflen);
 	#else
 	int strerror_r(int errnum, char *buf, size_t buflen);
 	#endif
 
-	#ifdef STRERROR_R_CHAR_P
+	#if STRERROR_R_CHAR_P
 		#define lxc_log_strerror_r                                               \
 			char errno_buf[PATH_MAX / 2] = {"Failed to get errno string"};   \
 			char *ptr = NULL;                                                \