--- a/src/ucx/cx/common.h	Mon May 26 21:02:30 2025 +0200
+++ b/src/ucx/cx/common.h	Mon May 26 21:06:17 2025 +0200
@@ -150,7 +150,7 @@
  */
 #define cx_attr_malloc __attribute__((__malloc__))
 
-#ifndef __clang__
+#if !defined(__clang__) && __GNUC__ >= 11
 /**
  * The pointer returned by the attributed function is supposed to be freed
  * by @p freefunc.
@@ -240,20 +240,6 @@
  */
 #define cx_attr_access_w(...) cx_attr_access(__write_only__, __VA_ARGS__)
 
-#if __STDC_VERSION__ >= 202300L
-
-/**
- * Do not warn about unused variable.
- */
-#define cx_attr_unused [[maybe_unused]]
-
-/**
- * Warn about discarded return value.
- */
-#define cx_attr_nodiscard [[nodiscard]]
-
-#else // no C23
-
 /**
  * Do not warn about unused variable.
  */
@@ -264,8 +250,6 @@
  */
 #define cx_attr_nodiscard __attribute__((__warn_unused_result__))
 
-#endif // __STDC_VERSION__
-
 
 // ---------------------------------------------------------------------------
 //       MSVC specifics