Module: Mesa
Branch: staging/19.1
Commit: dfcde49122b2d6c0920b3e49cd41ef908f668ccd
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dfcde49122b2d6c0920b3e49cd41ef908f668ccd
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Tue Oct 8 15:36:48 2019 -0700
intel/common: include unistd.h for ioctl() prototype on Solaris
Fixes build errors of:
In file included from ../src/intel/vulkan/anv_private.h:48,
from ../src/intel/vulkan/genX_blorp_exec.c:26:
../src/intel/common/gen_gem.h: In function ‘gen_ioctl’:
../src/intel/common/gen_gem.h:68:15: error: implicit declaration of function
‘ioctl’ [-Werror=implicit-function-declaration]
68 | ret = ioctl(fd, request, arg);
| ^~~~~
In file included from ../include/c11/threads_posix.h:35,
from ../include/c11/threads.h:66,
from ../src/mesa/main/mtypes.h:39,
from ../src/intel/compiler/brw_compiler.h:30,
from ../src/intel/vulkan/anv_private.h:51,
from ../src/intel/vulkan/genX_blorp_exec.c:26:
/usr/include/unistd.h: At top level:
/usr/include/unistd.h:471:12: error: conflicting types for ‘ioctl’
471 | extern int ioctl(int, int, ...);
| ^~~~~
/usr/include/unistd.h:471:1: note: a parameter list with an ellipsis can’t
match an empty parameter name list declaration
471 | extern int ioctl(int, int, ...);
| ^~~~~~
In file included from ../src/intel/vulkan/anv_private.h:48,
from ../src/intel/vulkan/genX_blorp_exec.c:26:
../src/intel/common/gen_gem.h:68:15: note: previous implicit declaration of
‘ioctl’ was here
68 | ret = ioctl(fd, request, arg);
| ^~~~~
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Acked-by: Eric Engestrom <eric.engest...@intel.com>
(cherry picked from commit 6804b8e1ff4b62b6685418f773041f10db01f879)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com>
Conflicts:
src/intel/common/gen_gem.h
---
src/intel/common/gen_gem.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/intel/common/gen_gem.h b/src/intel/common/gen_gem.h
index 8df2c249e48..2f609837a87 100644
--- a/src/intel/common/gen_gem.h
+++ b/src/intel/common/gen_gem.h
@@ -25,6 +25,7 @@
#define GEN_GEM_H
#include <stdint.h>
+#include <unistd.h>
static inline uint64_t
gen_canonical_address(uint64_t v)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
