diff options
| -rw-r--r-- | pfinet/ChangeLog | 8 | ||||
| -rw-r--r-- | pfinet/glue-include/linux/socket.h | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog index c701197c..279ab1d6 100644 --- a/pfinet/ChangeLog +++ b/pfinet/ChangeLog @@ -1,3 +1,11 @@ +2001-07-25 Mark Kettenis <kettenis@gnu.org> + + * glue-include/linux/socket.h (SOMAXCONN): Only define if it + wasn't already. + (msg_control, msg_controllen, struct cmsghdr, cmsg_len, cmsg_type, + cmsg_level, CMSG_FIRSTHDR, CMSG_NXTHDR, CMSG_DATA, CMSG_LEN): Only + define if CMSG_DATA wasn't already defined. + 2001-07-18 Marcus Brinkmann <marcus@gnu.org> * linux-src/net/ipv4/devinit.c (configure_device): Initialize IFA diff --git a/pfinet/glue-include/linux/socket.h b/pfinet/glue-include/linux/socket.h index 8d5774de..bf37f490 100644 --- a/pfinet/glue-include/linux/socket.h +++ b/pfinet/glue-include/linux/socket.h @@ -48,9 +48,11 @@ #define SO_BSDCOMPAT 192 /* Maximum queue length specifiable by listen. */ +#ifndef SOMAXCONN #define SOMAXCONN 128 +#endif -/* XXX */ +#ifndef CMSG_DATA #define msg_control msg_accrights #define msg_controllen msg_accrightslen struct cmsghdr { int cmsg_garbage; }; @@ -65,7 +67,11 @@ put_cmsg(struct msghdr *msg, int level, int type, int len, void *data) #define CMSG_DATA(cmsg) (0) #define CMSG_ALIGN(size) (0) #define CMSG_LEN(size) (0) - +#else +static inline int +put_cmsg(struct msghdr *msg, int level, int type, int len, void *data) +{ return 0; } +#endif #define MSG_NOSIGNAL 0 #define MSG_ERRQUEUE 0 |