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: 2e1e6511f7
       ("util: extract get_process_name from xmlconfig.c")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Dylan Baker
2018-07-10 15:00:13 -07:00
parent cb6b241c30
commit 17f49950da
7 changed files with 8 additions and 8 deletions

View File

@@ -29,7 +29,7 @@
#include "pipe/p_config.h" #include "pipe/p_config.h"
#include "os/os_process.h" #include "os/os_process.h"
#include "util/u_memory.h" #include "util/u_memory.h"
#include "util/process.h" #include "util/u_process.h"
#if defined(PIPE_SUBSYSTEM_WINDOWS_USER) #if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
# include <windows.h> # include <windows.h>

View File

@@ -24,8 +24,8 @@ MESA_UTIL_FILES := \
mesa-sha1.h \ mesa-sha1.h \
os_time.c \ os_time.c \
os_time.h \ os_time.h \
process.c \ u_process.c \
process.h \ u_process.h \
sha1/sha1.c \ sha1/sha1.c \
sha1/sha1.h \ sha1/sha1.h \
ralloc.c \ ralloc.c \

View File

@@ -48,8 +48,8 @@ files_mesa_util = files(
'mesa-sha1.h', 'mesa-sha1.h',
'os_time.c', 'os_time.c',
'os_time.h', 'os_time.h',
'process.c', 'u_process.c',
'process.h', 'u_process.h',
'sha1/sha1.c', 'sha1/sha1.c',
'sha1/sha1.h', 'sha1/sha1.h',
'ralloc.c', 'ralloc.c',

View File

@@ -25,7 +25,7 @@
* of the Software. * of the Software.
*/ */
#include "process.h" #include "u_process.h"
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>

View File

@@ -31,7 +31,7 @@
#include "util/os_time.h" #include "util/os_time.h"
#include "util/u_string.h" #include "util/u_string.h"
#include "util/u_thread.h" #include "util/u_thread.h"
#include "process.h" #include "u_process.h"
static void util_queue_killall_and_wait(struct util_queue *queue); static void util_queue_killall_and_wait(struct util_queue *queue);

View File

@@ -37,7 +37,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include "xmlconfig.h" #include "xmlconfig.h"
#include "process.h" #include "u_process.h"
/** \brief Find an option in an option cache with the name as key */ /** \brief Find an option in an option cache with the name as key */