From 17f49950da91137366910183f616d15b8bbf580c Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 10 Jul 2018 15:00:13 -0700 Subject: util: move process.[ch] to u_process.[ch] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On windows process.h is a system provided header, and it's required in include/c11/threads_win32.h. This header interferes with searching for that header, and results in windows build warnings with scons, but errors in meson which doesn't allow implicit function declarations. Just rename process to u_process, which follows the style of utils anyway. Fixes: 2e1e6511f76370870b5cde10caa9ca3b6d0dc65f ("util: extract get_process_name from xmlconfig.c") Signed-off-by: Dylan Baker Reviewed-by: Marek Olšák --- src/gallium/auxiliary/os/os_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gallium/auxiliary/os') diff --git a/src/gallium/auxiliary/os/os_process.c b/src/gallium/auxiliary/os/os_process.c index 87072f0b046..766cf806153 100644 --- a/src/gallium/auxiliary/os/os_process.c +++ b/src/gallium/auxiliary/os/os_process.c @@ -29,7 +29,7 @@ #include "pipe/p_config.h" #include "os/os_process.h" #include "util/u_memory.h" -#include "util/process.h" +#include "util/u_process.h" #if defined(PIPE_SUBSYSTEM_WINDOWS_USER) # include -- cgit v1.2.3