Module Name: src
Committed By: christos
Date: Sat Jan 24 17:15:22 UTC 2015
Modified Files:
src/sys/sys: socket.h
Log Message:
back to return u_char * according to:
http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/socket.h.html
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/sys/socket.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/socket.h
diff -u src/sys/sys/socket.h:1.113 src/sys/sys/socket.h:1.114
--- src/sys/sys/socket.h:1.113 Mon Jan 19 20:10:16 2015
+++ src/sys/sys/socket.h Sat Jan 24 12:15:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.113 2015/01/20 01:10:16 christos Exp $ */
+/* $NetBSD: socket.h,v 1.114 2015/01/24 17:15:22 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -528,11 +528,11 @@ struct cmsghdr {
/* given pointer to struct cmsghdr, return pointer to data */
#define CMSG_DATA(cmsg) \
- ((void *)((u_char *)(void *)(cmsg) + \
- __CMSG_ALIGN(sizeof(struct cmsghdr))))
+ ((u_char *)(void *)(cmsg) + \
+ __CMSG_ALIGN(sizeof(struct cmsghdr)))
#define CCMSG_DATA(cmsg) \
- ((const void *)((const u_char *)(const void *)(cmsg) + \
- __CMSG_ALIGN(sizeof(struct cmsghdr))))
+ ((const u_char *)(const void *)(cmsg) + \
+ __CMSG_ALIGN(sizeof(struct cmsghdr)))
/*
* Alignment requirement for CMSG struct manipulation.
