[Mesa-dev] [PATCH v2 01/49] util: move process.[ch] to u_process.[ch]
Dylan Baker
dylan at pnwbakers.com
Tue Jul 10 23:17:29 UTC 2018
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.
---
src/gallium/auxiliary/os/os_process.c | 2 +-
src/util/Makefile.sources | 4 ++--
src/util/meson.build | 4 ++--
src/util/{process.c => u_process.c} | 2 +-
src/util/{process.h => u_process.h} | 0
src/util/u_queue.c | 2 +-
src/util/xmlconfig.c | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
rename src/util/{process.c => u_process.c} (99%)
rename src/util/{process.h => u_process.h} (100%)
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>
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index fe34fc26690..531fd833c7f 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -24,8 +24,8 @@ MESA_UTIL_FILES := \
mesa-sha1.h \
os_time.c \
os_time.h \
- process.c \
- process.h \
+ u_process.c \
+ u_process.h \
sha1/sha1.c \
sha1/sha1.h \
ralloc.c \
diff --git a/src/util/meson.build b/src/util/meson.build
index 1838719d271..27a6fc118e5 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -48,8 +48,8 @@ files_mesa_util = files(
'mesa-sha1.h',
'os_time.c',
'os_time.h',
- 'process.c',
- 'process.h',
+ 'u_process.c',
+ 'u_process.h',
'sha1/sha1.c',
'sha1/sha1.h',
'ralloc.c',
diff --git a/src/util/process.c b/src/util/u_process.c
similarity index 99%
rename from src/util/process.c
rename to src/util/u_process.c
index 6e6376986f3..5bf3f56db4e 100644
--- a/src/util/process.c
+++ b/src/util/u_process.c
@@ -25,7 +25,7 @@
* of the Software.
*/
-#include "process.h"
+#include "u_process.h"
#include <string.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/util/process.h b/src/util/u_process.h
similarity index 100%
rename from src/util/process.h
rename to src/util/u_process.h
diff --git a/src/util/u_queue.c b/src/util/u_queue.c
index be95d9eec3f..4ce1af518b3 100644
--- a/src/util/u_queue.c
+++ b/src/util/u_queue.c
@@ -31,7 +31,7 @@
#include "util/os_time.h"
#include "util/u_string.h"
#include "util/u_thread.h"
-#include "process.h"
+#include "u_process.h"
static void util_queue_killall_and_wait(struct util_queue *queue);
diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c
index d3847911baa..ba657294c1c 100644
--- a/src/util/xmlconfig.c
+++ b/src/util/xmlconfig.c
@@ -37,7 +37,7 @@
#include <unistd.h>
#include <errno.h>
#include "xmlconfig.h"
-#include "process.h"
+#include "u_process.h"
/** \brief Find an option in an option cache with the name as key */
--
2.18.0
More information about the mesa-dev
mailing list