From 498557bfb67b618baefb21bc65708ee921f690e1 Mon Sep 17 00:00:00 2001 From: njoly Date: Fri, 27 Dec 2013 15:10:53 +0000 Subject: Rename ipcall/socketcall specific defines to avoid conflict with syscalls definitions. No functional changes. --- sys/compat/linux/common/linux_socketcall.c | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'sys/compat/linux/common/linux_socketcall.c') diff --git a/sys/compat/linux/common/linux_socketcall.c b/sys/compat/linux/common/linux_socketcall.c index f76cbb0cdde..96e20262bc4 100644 --- a/sys/compat/linux/common/linux_socketcall.c +++ b/sys/compat/linux/common/linux_socketcall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.42 2012/06/22 08:47:47 martin Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.43 2013/12/27 15:10:53 njoly Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.42 2012/06/22 08:47:47 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.43 2013/12/27 15:10:53 njoly Exp $"); #include #include @@ -144,7 +144,7 @@ linux_sys_socketcall(struct lwp *l, const struct linux_sys_socketcall_args *uap, DPRINTF(("linux_socketcall('%s'): ", linux_socketcall[SCARG(uap, what)].name)); - if (SCARG(uap, what) == LINUX_SYS_socket) { + if (SCARG(uap, what) == LINUX_SYS_SOCKET) { DPRINTF(("[dom %d type %d proto %d]\n", lda.dummy_ints[0], lda.dummy_ints[1], @@ -165,55 +165,55 @@ linux_sys_socketcall(struct lwp *l, const struct linux_sys_socketcall_args *uap, #endif switch (SCARG(uap, what)) { - case LINUX_SYS_socket: + case LINUX_SYS_SOCKET: error = linux_sys_socket(l, (void *)&lda, retval); break; - case LINUX_SYS_bind: + case LINUX_SYS_BIND: error = linux_sys_bind(l, (void *)&lda, retval); break; - case LINUX_SYS_connect: + case LINUX_SYS_CONNECT: error = linux_sys_connect(l, (void *)&lda, retval); break; - case LINUX_SYS_listen: + case LINUX_SYS_LISTEN: error = sys_listen(l, (void *)&lda, retval); break; - case LINUX_SYS_accept: + case LINUX_SYS_ACCEPT: error = linux_sys_accept(l, (void *)&lda, retval); break; - case LINUX_SYS_getsockname: + case LINUX_SYS_GETSOCKNAME: error = linux_sys_getsockname(l, (void *)&lda, retval); break; - case LINUX_SYS_getpeername: + case LINUX_SYS_GETPEERNAME: error = linux_sys_getpeername(l, (void *)&lda, retval); break; - case LINUX_SYS_socketpair: + case LINUX_SYS_SOCKETPAIR: error = linux_sys_socketpair(l, (void *)&lda, retval); break; - case LINUX_SYS_send: + case LINUX_SYS_SEND: error = linux_sys_send(l, (void *)&lda, retval); break; - case LINUX_SYS_recv: + case LINUX_SYS_RECV: error = linux_sys_recv(l, (void *)&lda, retval); break; - case LINUX_SYS_sendto: + case LINUX_SYS_SENDTO: error = linux_sys_sendto(l, (void *)&lda, retval); break; - case LINUX_SYS_recvfrom: + case LINUX_SYS_RECVFROM: error = linux_sys_recvfrom(l, (void *)&lda, retval); break; - case LINUX_SYS_shutdown: + case LINUX_SYS_SHUTDOWN: error = sys_shutdown(l, (void *)&lda, retval); break; - case LINUX_SYS_setsockopt: + case LINUX_SYS_SETSOCKOPT: error = linux_sys_setsockopt(l, (void *)&lda, retval); break; - case LINUX_SYS_getsockopt: + case LINUX_SYS_GETSOCKOPT: error = linux_sys_getsockopt(l, (void *)&lda, retval); break; - case LINUX_SYS_sendmsg: + case LINUX_SYS_SENDMSG: error = linux_sys_sendmsg(l, (void *)&lda, retval); break; - case LINUX_SYS_recvmsg: + case LINUX_SYS_RECVMSG: error = linux_sys_recvmsg(l, (void *)&lda, retval); break; default: -- cgit