From 105dcfcd3b9085fb57a93a5bef055f02f535c697 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 22 Apr 2004 04:31:34 +0000 Subject: 2004-04-22 Ralf Corsepius * libnetworking/sys/socket.h: Further update from FreeBSD (Add sa_family_t). --- cpukit/ChangeLog | 5 +++++ cpukit/libnetworking/sys/socket.h | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f0ca188514..5f58e2321b 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2004-04-22 Ralf Corsepius + + * libnetworking/sys/socket.h: Further update from FreeBSD + (Add sa_family_t). + 2004-04-22 Ralf Corsepius * libnetworking/sys/protosw.h: Partial update from FreeBSD. diff --git a/cpukit/libnetworking/sys/socket.h b/cpukit/libnetworking/sys/socket.h index e6187f299f..7899eaf79a 100644 --- a/cpukit/libnetworking/sys/socket.h +++ b/cpukit/libnetworking/sys/socket.h @@ -42,6 +42,7 @@ #if defined(__rtems__) /* RTEMS doesn't have FreeBSD's sys/_types.h machinery. */ typedef int socklen_t; +typedef unsigned char sa_family_t; #endif /* @@ -157,7 +158,7 @@ struct sockwakeup { */ struct sockaddr { unsigned char sa_len; /* total length */ - u_char sa_family; /* address family */ + sa_family_t sa_family; /* address family */ char sa_data[14]; /* actually longer; address value */ }; @@ -278,12 +279,12 @@ struct sockproto { * Used value-result for recvmsg, value only for sendmsg. */ struct msghdr { - void *msg_name; /* optional address */ - u_int msg_namelen; /* size of address */ + void *msg_name; /* optional address */ + socklen_t msg_namelen; /* size of address */ struct iovec *msg_iov; /* scatter/gather array */ int msg_iovlen; /* # elements in msg_iov */ - void *msg_control; /* ancillary data, see below */ - u_int msg_controllen; /* ancillary data buffer len */ + void *msg_control; /* ancillary data, see below */ + socklen_t msg_controllen; /* ancillary data buffer len */ int msg_flags; /* flags on received message */ }; @@ -305,7 +306,7 @@ struct msghdr { * of message elements headed by cmsghdr structures. */ struct cmsghdr { - u_int cmsg_len; /* data byte count, including hdr */ + socklen_t cmsg_len; /* data byte count, including hdr */ int cmsg_level; /* originating protocol */ int cmsg_type; /* protocol-specific type */ /* followed by u_char cmsg_data[]; */ -- cgit v1.2.3