summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsen Arsenović <arsen@aarsen.me>2022-12-04 22:19:20 +0100
committerArsen Arsenović <arsen@aarsen.me>2022-12-04 22:27:58 +0100
commite176b676cff17948d68299c00dddefe41638c752 (patch)
tree747ce93e8f38021190f4617f3bb2bc8de068ed5b
parent6c057be0f0aef0aeabb9a00e6814548fed0c125a (diff)
ICEmsg: Fix C++ interoperability error due to static_assert define
Commit 0269c687e954db7aca2a4344e32cb203315a00b6 added a static_assert helper that gets defined to blank if left undefined by assert.h. As this is not a macro in other languages that use this header, this can lead to a compile-time error. Bug: https://bugs.gentoo.org/884369
-rw-r--r--include/X11/ICE/ICEmsg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h
index b6bad13..13e1509 100644
--- a/include/X11/ICE/ICEmsg.h
+++ b/include/X11/ICE/ICEmsg.h
@@ -34,7 +34,7 @@ Author: Ralph Mor, X Consortium
#include <X11/ICE/ICEconn.h>
#include <assert.h>
-#ifndef static_assert
+#if !defined(__cplusplus) && !defined(static_assert)
#define static_assert(cond, msg) /* skip for non-C11 compilers */
#endif