diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-11-02 04:53:47 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-11-02 04:53:47 +0000 |
| commit | b44518130b33cadb5c1d619e9e936ae0e0dbf7cb (patch) | |
| tree | 6069eb03c39fbc79808a7d94f857118cce75cbe3 /lib/mesa/src/util/u_debug_stack.c | |
| parent | 32aeb3c41fedbbd7b11aacfec48e8f699d16bff0 (diff) | |
Merge Mesa 23.1.9
Diffstat (limited to 'lib/mesa/src/util/u_debug_stack.c')
| -rw-r--r-- | lib/mesa/src/util/u_debug_stack.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/mesa/src/util/u_debug_stack.c b/lib/mesa/src/util/u_debug_stack.c index f213bfbf3..9cfb61a32 100644 --- a/lib/mesa/src/util/u_debug_stack.c +++ b/lib/mesa/src/util/u_debug_stack.c @@ -36,7 +36,7 @@ #include "util/u_debug.h" #include "u_debug_symbol.h" #include "u_debug_stack.h" -#include "pipe/p_config.h" +#include "util/detect.h" #if defined(HAVE_LIBUNWIND) @@ -45,7 +45,7 @@ #endif #include <dlfcn.h> -#include "os/os_thread.h" +#include "util/u_thread.h" #include "util/hash_table.h" static struct hash_table* symbols_hash; @@ -183,7 +183,7 @@ debug_backtrace_print(FILE *f, /* Not implemented here; see u_debug_stack_android.cpp */ #else /* ! HAVE_LIBUNWIND */ -#if defined(PIPE_OS_WINDOWS) +#if DETECT_OS_WINDOWS #include <windows.h> #endif @@ -210,7 +210,7 @@ debug_backtrace_capture(struct debug_stack_frame *backtrace, * * It works reliably both for x86 for x86_64. */ -#if defined(PIPE_OS_WINDOWS) +#if DETECT_OS_WINDOWS { typedef USHORT (WINAPI *PFNCAPTURESTACKBACKTRACE)(ULONG, ULONG, PVOID *, PULONG); @@ -249,13 +249,13 @@ debug_backtrace_capture(struct debug_stack_frame *backtrace, } #endif -#ifdef PIPE_ARCH_X86 -#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION > 404) || defined(__clang__) +#if DETECT_ARCH_X86 +#if DETECT_CC_GCC && (DETECT_CC_GCC_VERSION > 404) || defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wframe-address" const void **frame_pointer = ((const void **)__builtin_frame_address(1)); #pragma GCC diagnostic pop -#elif defined(PIPE_CC_MSVC) +#elif DETECT_CC_MSVC const void **frame_pointer; __asm { mov frame_pointer, ebp |