summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-07-10 15:00:13 -0700
committerDylan Baker <[email protected]>2018-08-01 12:47:16 -0700
commit17f49950da91137366910183f616d15b8bbf580c (patch)
tree4d3c1dbcf8c588a24adccba262d2d6dd4e9b5130 /src/gallium/auxiliary
parentcb6b241c301d5352a5bcaab52bbfaf89e700b2b2 (diff)
util: move process.[ch] to u_process.[ch]
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 <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/os/os_process.c2
1 files changed, 1 insertions, 1 deletions
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 <windows.h>