From 27efc4852d05670caa25a278ebc5a8d920b73854 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Thu, 15 Apr 2021 21:34:12 +0200 Subject: [PATCH] egl/android: include "util/compiler.h" for FALLTHROUGH macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following building error: external/mesa/src/egl/drivers/dri2/platform_android.c:1263:10: error: use of undeclared identifier 'FALLTHROUGH' FALLTHROUGH; /* for pbuffers */ ^ 1 error generated. Fixes: 2928c21eb73b ("Convert most remaining free-form fall-through comments to FALLTHROUGH") Reviewed-by: Tapani Pälli Part-of: (cherry picked from commit 0a71aaa29d78a3490940bc0bd287136b3e3774ee) --- .pick_status.json | 2 +- src/egl/drivers/dri2/platform_android.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index b8d82cd940b..09c8bb7732c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -41314,7 +41314,7 @@ "description": "egl/android: include \"util/compiler.h\" for FALLTHROUGH macro", "nominated": false, "nomination_type": 1, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": "2928c21eb73b66d22d1f383abf62de583547f81f" }, diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 1fb3166dc91..2fff5ac4dc4 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -39,6 +39,7 @@ #include #include +#include "util/compiler.h" #include "util/os_file.h" #include "loader.h"