Mesa (master): util: remove the dependency on kcmp.h

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Feb 20 02:16:37 UTC 2020


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Feb 18 16:12:23 2020 -0500

util: remove the dependency on kcmp.h

Fixes: f76cbc7901f7 "util: Add os_same_file_description helper"

Acked-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3860>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3860>

---

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

diff --git a/src/util/os_file.c b/src/util/os_file.c
index b502ff4b0ef..128fe872db1 100644
--- a/src/util/os_file.c
+++ b/src/util/os_file.c
@@ -34,11 +34,12 @@ os_file_create_unique(const char *filename, int filemode)
 #if defined(__linux__)
 
 #include <fcntl.h>
-#include <linux/kcmp.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <unistd.h>
 
+/* copied from <linux/kcmp.h> */
+#define KCMP_FILE 0
 
 static ssize_t
 readN(int fd, char *buf, size_t len)



More information about the mesa-commit mailing list