From: Loïc Collignon <ctxnop@gmail.com>
Date: Wed, 3 Aug 2022 09:42:28 +0000 (+0200)
Subject: Fix 24172: __STDC_VERSION__ may be defined in C++
X-Git-Tag: v252-rc1~530
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00852912edc69e652f4932fa536da60528f08ed3;p=thirdparty%2Fsystemd.git

Fix 24172: __STDC_VERSION__ may be defined in C++

According to the C++ ISO standard, a conformant compiler is allowed to
define this macro to any value for any reason as it is implementation
defined: https://timsong-cpp.github.io/cppwp/cpp.predefined#2.3

This mean that it cannot be assumed that it is not defined in a C++.
Change the condition to reflect that.
---

diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h
index 38449463e24..6f657c22543 100644
--- a/src/systemd/_sd-common.h
+++ b/src/systemd/_sd-common.h
@@ -85,7 +85,7 @@ typedef void (*_sd_destroy_t)(void *userdata);
 #endif
 
 #ifndef _SD_ARRAY_STATIC
-#  if __STDC_VERSION__ >= 199901L
+#  if __STDC_VERSION__ >= 199901L && !defined(__cplusplus)
 #    define _SD_ARRAY_STATIC static
 #  else
 #    define _SD_ARRAY_STATIC