frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xf86-input-inputtest: Fix build on systems without SOCK_NONBLOCK 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 707f23dab8)
This commit is contained in:
Jeremy Huddleston Sequoia 2022-06-20 20:05:46 -07:00
parent afcaaac967
commit 3868f36472
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/drivers/inputtest/xf86-input-inputtest.c
View File

@ -1005,7 +1005,19 @@ pre_init(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
unlink(driver_data->socket_path); unlink(driver_data->socket_path);
#ifdef SOCK_NONBLOCK
driver_data->socket_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0); driver_data->socket_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
#else
int fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd >= 0) {
flags = fcntl(fd, F_GETFL, 0);
if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
fd = -1;
}
}
driver_data->socket_fd = fd;
#endif
if (driver_data->socket_fd < 0) { if (driver_data->socket_fd < 0) {
xf86IDrvMsg(pInfo, X_ERROR, "Failed to create a socket for communication: %s\n", xf86IDrvMsg(pInfo, X_ERROR, "Failed to create a socket for communication: %s\n",
strerror(errno)); strerror(errno));