Mesa (master): util/u_process: fix Windows build

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Mar 24 16:22:27 UTC 2020


Module: Mesa
Branch: master
Commit: bd22a0f710ca48a49948a6463228c0d01d2fa74f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd22a0f710ca48a49948a6463228c0d01d2fa74f

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Tue Mar 24 16:12:26 2020 +0100

util/u_process: fix Windows build

Reported by Brian Paul.

Fixes: f8f1413070a ("util/u_process: add util_get_process_exec_path")
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4303>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4303>

---

 src/util/u_process.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/util/u_process.c b/src/util/u_process.c
index 686e4624429..0454760f471 100644
--- a/src/util/u_process.c
+++ b/src/util/u_process.c
@@ -31,12 +31,13 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #undef GET_PROGRAM_NAME
 
 #if DETECT_OS_WINDOWS
 #include <windows.h>
+#else
+#include <unistd.h>
 #endif
 
 #if defined(__linux__) && defined(HAVE_PROGRAM_INVOCATION_NAME)



More information about the mesa-commit mailing list