falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed build failure

This commit is contained in:
dave 2018-10-08 13:58:10 -07:00 committed by queueRAM
parent 9dbbf36224
commit 5db1913741
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/ioctls.h
View File

@ -47,7 +47,7 @@
IOCTL(TIOCSETD, IOC_W, MK_PTR(TYPE_INT)) IOCTL(TIOCSETD, IOC_W, MK_PTR(TYPE_INT))
IOCTL(TIOCGPTN, IOC_R, MK_PTR(TYPE_INT)) IOCTL(TIOCGPTN, IOC_R, MK_PTR(TYPE_INT))
IOCTL(TIOCSPTLCK, IOC_W, MK_PTR(TYPE_INT)) IOCTL(TIOCSPTLCK, IOC_W, MK_PTR(TYPE_INT))
#ifdef TIOCGPTPEER #if defined TIOCGPTPEER && defined TARGET_TIOCGPTPEER
IOCTL_SPECIAL(TIOCGPTPEER, 0, do_ioctl_tiocgptpeer, TYPE_INT) IOCTL_SPECIAL(TIOCGPTPEER, 0, do_ioctl_tiocgptpeer, TYPE_INT)
#endif #endif
IOCTL(FIOCLEX, 0, TYPE_NULL) IOCTL(FIOCLEX, 0, TYPE_NULL)

5
linux-user/syscall.c
View File

@ -5787,7 +5787,7 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,
} }
#endif #endif
#ifdef TIOCGPTPEER #if defined TIOCGPTPEER && defined TARGET_TIOCGPTPEER
static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry *ie, uint8_t *buf_temp, static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry *ie, uint8_t *buf_temp,
int fd, int cmd, abi_long arg) int fd, int cmd, abi_long arg)
{ {
@ -13861,9 +13861,10 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
if (arg4) { if (arg4) {
if (copy_from_user_timeval(&tv[0], arg4) || if (copy_from_user_timeval(&tv[0], arg4) ||
copy_from_user_timeval(&tv[1], copy_from_user_timeval(&tv[1],
arg4 + sizeof(struct target_timeval))) arg4 + sizeof(struct target_timeval))) {
unlock_user(p, arg3, 0); unlock_user(p, arg3, 0);
goto efault; goto efault;
}
tvp = tv; tvp = tv;
} else { } else {
tvp = NULL; tvp = NULL;