summaryrefslogtreecommitdiff
path: root/sys/compat/linux/common/linux_socket.h
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2007-03-04 05:59:00 +0000
committerchristos <christos@NetBSD.org>2007-03-04 05:59:00 +0000
commit53524e44efd7c7176da8dc8190a698b2fe184db1 (patch)
tree68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/compat/linux/common/linux_socket.h
parent1b20cebad5f8d3582a41d5599641a95247721732 (diff)
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/compat/linux/common/linux_socket.h')
-rw-r--r--sys/compat/linux/common/linux_socket.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/compat/linux/common/linux_socket.h b/sys/compat/linux/common/linux_socket.h
index 6e78ea96611..b1f7b98823e 100644
--- a/sys/compat/linux/common/linux_socket.h
+++ b/sys/compat/linux/common/linux_socket.h
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.h,v 1.13 2005/12/11 12:20:19 christos Exp $ */
+/* $NetBSD: linux_socket.h,v 1.14 2007/03/04 06:01:24 christos Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -161,11 +161,11 @@
#define LINUX_CMSG_DATA(cmsg) \
((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))
#define LINUX_CMSG_NXTHDR(mhdr, cmsg) \
- (((__caddr_t)(cmsg) + LINUX_CMSG_ALIGN((cmsg)->cmsg_len) + \
+ (((char *)(cmsg) + LINUX_CMSG_ALIGN((cmsg)->cmsg_len) + \
LINUX_CMSG_ALIGN(sizeof(struct cmsghdr)) > \
- (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
+ (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
(struct cmsghdr *)NULL : \
- (struct cmsghdr *)((__caddr_t)(cmsg) + \
+ (struct cmsghdr *)((char *)(cmsg) + \
LINUX_CMSG_ALIGN((cmsg)->cmsg_len)))
#define LINUX_CMSG_ALIGNDIFF \
(CMSG_ALIGN(sizeof(struct cmsghdr)) - LINUX_CMSG_ALIGN(sizeof(struct cmsghdr)))