From: aoyama <aoyama@openbsd.org>
Date: Thu, 19 Jan 2023 10:59:24 +0000 (+0000)
Subject: Do not use unsupported __attribute__((warn_unused_result)) on gcc3.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=196a8b7f4cfc28ba67298490a91a38fd510e896c;p=openbsd

Do not use unsupported __attribute__((warn_unused_result)) on gcc3.

This prevents building libfido2 stops with error on luna88k because it
is compiled with -Werror option.

ok, and better #if condition by miod@
---

diff --git a/lib/libcbor/src/cbor/common.h b/lib/libcbor/src/cbor/common.h
index 6a6f969f23f..410ef24d517 100644
--- a/lib/libcbor/src/cbor/common.h
+++ b/lib/libcbor/src/cbor/common.h
@@ -83,7 +83,11 @@ extern bool _cbor_enable_assert;
 #define _CBOR_UNUSED(x) __attribute__((__unused__)) x
 // TODO(https://github.com/PJK/libcbor/issues/247): Prefer [[nodiscard]] if
 // available
+#if ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ >= 4)
 #define _CBOR_NODISCARD __attribute__((warn_unused_result))
+#else	/* gcc3 can not treat warn_unused_result attribute */
+#define _CBOR_NODISCARD
+#endif
 #elif defined(_MSC_VER)
 #define _CBOR_UNUSED(x) __pragma(warning(suppress : 4100 4101)) x
 #define _CBOR_NODISCARD