From 7240cc553e41b53acba459184d5178fd2ff2f1fa Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 15 Sep 2022 20:33:45 +0800 Subject: [PATCH] drm-shim: drop gnu99 override If we override with gnu99 here, we effectively down-grade from C11, meaning we can no longer assume static_assert support. Fixes: 45fb815a756 ("util: implement STATIC_ASSERT using c++11 / c11 primitives") Signed-off-by: Yonggang Luo Suggested-by: Chia-I Wu Reviewed-by: Erik Faye-Lund Reviewed-by: Eric Engestrom Reviewed-by: Chia-I Wu Part-of: (cherry picked from commit a9f3e011e5f14af4ac4ccd6e581b6ec7cd8b8554) --- .pick_status.json | 2 +- src/drm-shim/drm_shim.c | 2 +- src/drm-shim/meson.build | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e224868e07d..455fc92d46c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5692,7 +5692,7 @@ "description": "drm-shim: drop gnu99 override", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "45fb815a75669b32f6317ba6d53ec9465a4b0ae0" }, diff --git a/src/drm-shim/drm_shim.c b/src/drm-shim/drm_shim.c index c7025edda42..672a4e74c9f 100644 --- a/src/drm-shim/drm_shim.c +++ b/src/drm-shim/drm_shim.c @@ -52,7 +52,7 @@ #include "util/u_debug.h" #include "drm_shim.h" -#define REAL_FUNCTION_POINTER(x) typeof(x) *real_##x +#define REAL_FUNCTION_POINTER(x) __typeof__(x) *real_##x static mtx_t shim_lock = _MTX_INITIALIZER_NP; struct set *opendir_set; diff --git a/src/drm-shim/meson.build b/src/drm-shim/meson.build index 2a7ea000a61..bd56e642c02 100644 --- a/src/drm-shim/meson.build +++ b/src/drm-shim/meson.build @@ -28,7 +28,6 @@ drm_shim = static_library( include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies: [dep_libdrm, idep_mesautil, dep_dl], gnu_symbol_visibility : 'hidden', - override_options : ['c_std=gnu99'], ) dep_drm_shim = declare_dependency( link_with: drm_shim,