- (stevesk) OpenSSH CVS update:

[openssh.git] / fake-socket.h

diff --git a/fake-socket.h b/fake-socket.h
index e11ad44e0a1190d4275b16f53c01dedd7e8312c9..b51caa030ccbeea9c3eccf66dfbe765462d8823c 100644 (file)
--- a/fake-socket.h
+++ b/fake-socket.h
@@ -5,22 +5,18 @@
 #include "sys/types.h"
 
 #ifndef HAVE_STRUCT_SOCKADDR_STORAGE
-#define        _SS_MAXSIZE     128     /* Implementation specific max size */
-#define        _SS_ALIGNSIZE   (sizeof(int))
-#define        _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(u_short))
-#define        _SS_PAD2SIZE    (_SS_MAXSIZE - (sizeof(u_short) + \
-                                       _SS_PAD1SIZE + _SS_ALIGNSIZE))
+# define       _SS_MAXSIZE     128     /* Implementation specific max size */
+# define       _SS_PADSIZE     (_SS_MAXSIZE - sizeof (struct sockaddr))
 
 struct sockaddr_storage {
-  u_short      ss_family;
-  char         __ss_pad1[_SS_PAD1SIZE];
-  int                  __ss_align;
-  char         __ss_pad2[_SS_PAD2SIZE];
+       struct  sockaddr ss_sa;
+       char            __ss_pad2[_SS_PADSIZE];
 };
+# define ss_family ss_sa.sa_family
 #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
 
 #ifndef IN6_IS_ADDR_LOOPBACK
-#define IN6_IS_ADDR_LOOPBACK(a) \
+# define IN6_IS_ADDR_LOOPBACK(a) \
        (((u_int32_t *) (a))[0] == 0 && ((u_int32_t *) (a))[1] == 0 && \
         ((u_int32_t *) (a))[2] == 0 && ((u_int32_t *) (a))[3] == htonl (1))
 #endif /* !IN6_IS_ADDR_LOOPBACK */