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/gallium/auxiliary/rtasm | |
parent | 32aeb3c41fedbbd7b11aacfec48e8f699d16bff0 (diff) |
Merge Mesa 23.1.9
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/rtasm')
-rw-r--r-- | lib/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/lib/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c index 8d5195ac0..2aa545919 100644 --- a/lib/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c +++ b/lib/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c @@ -33,7 +33,7 @@ #include "pipe/p_compiler.h" #include "util/u_debug.h" -#include "os/os_thread.h" +#include "util/u_thread.h" #include "util/u_memory.h" #include "rtasm_execmem.h" @@ -42,11 +42,11 @@ #define MAP_ANONYMOUS MAP_ANON #endif -#if defined(PIPE_OS_WINDOWS) +#if DETECT_OS_WINDOWS #include <windows.h> #endif -#if defined(PIPE_OS_UNIX) +#if DETECT_OS_UNIX /* @@ -137,7 +137,7 @@ rtasm_exec_free(void *addr) } -#elif defined(PIPE_OS_WINDOWS) +#elif DETECT_OS_WINDOWS /* |