Mesa (4094-libunwind-not-located-used-on-macos): util: Fix pointer to integer conversion error when using libunwind

[GitLab Mirror]

Module: Mesa
Branch: 4094-libunwind-not-located-used-on-macos
Commit: 19e9ea9ad79d897ae3fd045e73e9a3f08a7bae78
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=19e9ea9ad79d897ae3fd045e73e9a3f08a7bae78

Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Thu Jan 14 10:16:15 2021 -0800

util: Fix pointer to integer conversion error when using libunwind

../src/util/u_debug_stack.c:97:20: error: incompatible pointer to integer conversion assigning to 'unw_word_t' (aka 'unsigned long') from 'void *' [-Werror,-Wint-conversion]
   pip.unwind_info = NULL;
                   ^ ~~~~
1 error generated.

https://gitlab.freedesktop.org/mesa/mesa/-/issues/4094

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

---

 src/util/u_debug_stack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/u_debug_stack.c b/src/util/u_debug_stack.c
index 21f0371d3c1..01f69e14442 100644
--- a/src/util/u_debug_stack.c
+++ b/src/util/u_debug_stack.c
@@ -94,7 +94,7 @@ debug_backtrace_capture(struct debug_stack_frame *backtrace,
    unw_proc_info_t pip;
    unsigned i = 0;
 
-   pip.unwind_info = NULL;
+   pip.unwind_info = 0;
 
    unw_getcontext(&context);
    unw_init_local(&cursor, &context);