From 725741f10d5e8889115c5f25b7a1fafb7099d97c Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Thu, 24 Aug 2017 23:52:20 +0200 Subject: [PATCH] ac/debug: use util_strchrnul() to fix android build error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Similar to e09d04cd56 "radeonsi: use util_strchrnul() to fix android build error" Android Bionic does not support strchrnul() string function, gallium auxiliary util/u_string.h provides util_strchrnul() This change avoids the following warning and error: external/mesa/src/amd/common/ac_debug.c:501:15: warning: implicit declaration of function 'strchrnul' is invalid in C99 char *end = strchrnul(out, '\n'); ^ external/mesa/src/amd/common/ac_debug.c:501:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' char *end = strchrnul(out, '\n'); ^ ~~~~~~~~~~~~~~~~~~~~ 1 warning and 1 error generated. Fixes: c2c3912410 "ac/debug: annotate IB dumps with the raw values" Reviewed-by: Marek Olšák Signed-off-by: Rob Herring --- src/amd/common/ac_debug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_debug.c b/src/amd/common/ac_debug.c index 2af83a146c8..3daa556f5dd 100644 --- a/src/amd/common/ac_debug.c +++ b/src/amd/common/ac_debug.c @@ -39,6 +39,7 @@ #include "sid_tables.h" #include "util/u_math.h" #include "util/u_memory.h" +#include "util/u_string.h" /* Parsed IBs are difficult to read without colors. Use "less -R file" to * read them, or use "aha -b -f file" to convert them to html. @@ -498,7 +499,7 @@ static void format_ib_output(FILE *f, char *out) if (indent) print_spaces(f, indent); - char *end = strchrnul(out, '\n'); + char *end = util_strchrnul(out, '\n'); fwrite(out, end - out, 1, f); fputc('\n', f); /* always end with a new line */ if (!*end) -- 2.11.0