[BACK]Return to socket.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / sys

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/sys/socket.h between version 1.46.2.1 and 1.55.2.2

version 1.46.2.1, 2000/11/20 18:11:35 version 1.55.2.2, 2001/05/01 10:29:06
Line 75 
Line 75 
  * Data types.   * Data types.
  */   */
 #include <sys/ansi.h>  #include <sys/ansi.h>
   
 #ifndef sa_family_t  
 typedef __sa_family_t   sa_family_t;  
 #define sa_family_t     __sa_family_t  
 #endif  
   
 #ifndef socklen_t  #ifndef socklen_t
 typedef __socklen_t     socklen_t;  typedef __socklen_t     socklen_t;
 #define socklen_t       __socklen_t  #define socklen_t       __socklen_t
Line 189  struct linger {
Line 183  struct linger {
  * addresses.   * addresses.
  */   */
 struct sockaddr {  struct sockaddr {
         u_char          sa_len;         /* total length */          u_char  sa_len;                 /* total length */
         sa_family_t     sa_family;      /* address family */          u_char  sa_family;              /* address family */
         char            sa_data[14];    /* actually longer; address value */          char    sa_data[14];            /* actually longer; address value */
 };  };
   
 #if defined(_KERNEL)  #if defined(_KERNEL)
Line 217  struct sockproto {
Line 211  struct sockproto {
   
 #if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500  #if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500
 struct sockaddr_storage {  struct sockaddr_storage {
         u_char          ss_len;         /* address length */          u_char  ss_len;         /* address length */
         sa_family_t     ss_family;      /* address family */          u_char  ss_family;      /* address family */
         char            __ss_pad1[_SS_PAD1SIZE];          char    __ss_pad1[_SS_PAD1SIZE];
         int64_t      __ss_align;/* force desired structure storage alignment */          int64_t __ss_align;     /* force desired structure storage alignment */
         char            __ss_pad2[_SS_PAD2SIZE];          char    __ss_pad2[_SS_PAD2SIZE];
 };  };
 #endif /* !_XOPEN_SOURCE || ... */  #endif /* !_XOPEN_SOURCE || ... */
 #endif /* 1 */  #endif /* 1 */
Line 407  struct cmsghdr {
Line 401  struct cmsghdr {
   
 /* given pointer to struct cmsghdr, return pointer to data */  /* given pointer to struct cmsghdr, return pointer to data */
 #define CMSG_DATA(cmsg) \  #define CMSG_DATA(cmsg) \
         ((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))          ((u_char *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))
   
 /*  /*
  * Alignment requirement for CMSG struct manipulation.   * Alignment requirement for CMSG struct manipulation.
Legend:
Removed from v.1.46.2.1  
changed lines
  Added in v.1.55.2.2
CVSweb <webmaster@jp.NetBSD.org>