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,