[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.43.4.2 and 1.43.6.1

version 1.43.4.2, 1999/08/02 22:56:00 version 1.43.6.1, 1999/06/28 06:37:11
Line 197  struct sockproto {
Line 197  struct sockproto {
   
 #if 1  #if 1
 /*  /*
  * RFC 2553: protocol-independent placeholder for socket addresses   * bsd-api-new-02a: protocol-independent placeholder for socket addresses
  */   */
 #define _SS_MAXSIZE     128  #define _SS_MAXSIZE     128
 #define _SS_ALIGNSIZE   (sizeof(int64_t))  #define _SS_ALIGNSIZE   (sizeof(int64_t))
Line 205  struct sockproto {
Line 205  struct sockproto {
 #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(u_char) * 2 - \  #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(u_char) * 2 - \
                                 _SS_PAD1SIZE - _SS_ALIGNSIZE)                                  _SS_PAD1SIZE - _SS_ALIGNSIZE)
   
 #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 */
         u_char  __ss_family;    /* address family */          u_char  __ss_family;    /* address family */
Line 213  struct sockaddr_storage {
Line 212  struct sockaddr_storage {
         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
 #endif /* 1 */  
   
 /*  /*
  * Protocol families, same as address families for now.   * Protocol families, same as address families for now.
Line 407  struct cmsghdr {
Line 405  struct cmsghdr {
 /* given pointer to struct cmsghdr, return pointer to next cmsghdr */  /* given pointer to struct cmsghdr, return pointer to next cmsghdr */
 #define CMSG_NXTHDR(mhdr, cmsg) \  #define CMSG_NXTHDR(mhdr, cmsg) \
         (((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \          (((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \
             (((caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \              (caddr_t) ((mhdr)->msg_control + (mhdr)->msg_controllen)) ? \
             (struct cmsghdr *)NULL : \              (struct cmsghdr *)NULL : \
             (struct cmsghdr *)((caddr_t)(cmsg) + CMSG_ALIGN((cmsg)->cmsg_len)))              (struct cmsghdr *)((caddr_t)(cmsg) + CMSG_ALIGN((cmsg)->cmsg_len)))
   
Line 482  __END_DECLS
Line 480  __END_DECLS
 #define MSG_COMPAT      0x8000  #define MSG_COMPAT      0x8000
 #endif  #endif
   
   #include <sys/cdefs.h>
   
   __BEGIN_DECLS
 void    pfctlinput __P((int, struct sockaddr *));  void    pfctlinput __P((int, struct sockaddr *));
   __END_DECLS
 #endif /* !_KERNEL */  #endif /* !_KERNEL */
   
 #endif /* !_SYS_SOCKET_H_ */  #endif /* !_SYS_SOCKET_H_ */
Legend:
Removed from v.1.43.4.2  
changed lines
  Added in v.1.43.6.1
CVSweb <webmaster@jp.NetBSD.org>