Mesa (staging/19.2): intel/common: include unistd.h for ioctl() prototype on Solaris

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: 9d13289ad4aeea9c3d7afeff2c162688111e9ab7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d13289ad4aeea9c3d7afeff2c162688111e9ab7

Author: Alan Coopersmith <alan.coopersmith at 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.coopersmith at oracle.com>
Acked-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit 6804b8e1ff4b62b6685418f773041f10db01f879)

---

 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 c4dda6de657..fc48d54386b 100644
--- a/src/intel/common/gen_gem.h
+++ b/src/intel/common/gen_gem.h
@@ -26,6 +26,7 @@
 
 #include <errno.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 
 static inline uint64_t