1.1 --- a/epoc32/include/stdapis/sys/socket.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/sys/socket.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,8 @@
     1.4 -// © Portions copyright (c) 2006 Nokia Corporation.  All rights reserved.
     1.5 +
     1.6  
     1.7  /*-
     1.8   * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
     1.9   *	The Regents of the University of California.  All rights reserved.
    1.10 - * © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
    1.11   * Redistribution and use in source and binary forms, with or without
    1.12   * modification, are permitted provided that the following conditions
    1.13   * are met:
    1.14 @@ -27,7 +26,7 @@
    1.15   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    1.16   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    1.17   * SUCH DAMAGE.
    1.18 - *
    1.19 + * Portions Copyright (c) 2006-2007  Nokia Corporation and/or its subsidiary(-ies).  All rights reserved.
    1.20   *	@(#)socket.h	8.4 (Berkeley) 2/21/94
    1.21   * $FreeBSD: src/sys/sys/socket.h,v 1.88.2.1 2005/09/27 21:14:10 rwatson Exp $
    1.22   */
    1.23 @@ -40,7 +39,7 @@
    1.24  #include <sys/_types.h>
    1.25  #include <sys/_iovec.h>
    1.26  #define _NO_NAMESPACE_POLLUTION
    1.27 -#include <machine/param.h>
    1.28 +#include <stdapis/machine/param.h>
    1.29  #undef _NO_NAMESPACE_POLLUTION
    1.30  
    1.31  /*
    1.32 @@ -317,6 +316,7 @@
    1.33  /*
    1.34   * RFC 2553: protocol-independent placeholder for socket addresses
    1.35   */
    1.36 +#ifndef __SYMBIAN32__
    1.37  #define	_SS_MAXSIZE	128U
    1.38  #define	_SS_ALIGNSIZE	(sizeof(__int64_t))
    1.39  #define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(unsigned char) - \
    1.40 @@ -331,7 +331,19 @@
    1.41  	__int64_t	__ss_align;	/* force desired struct alignment */
    1.42  	char		__ss_pad2[_SS_PAD2SIZE];
    1.43  };
    1.44 +#else
    1.45 +#define _SS_MAXSIZE 128U
    1.46 +#define _SS_ALIGNSIZE   (sizeof(__int64_t))
    1.47 +#define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(u_short))
    1.48 +#define _SS_PAD2SIZE    (_SS_MAXSIZE -  sizeof(u_short) - _SS_PAD1SIZE - _SS_ALIGNSIZE)
    1.49  
    1.50 +struct sockaddr_storage {
    1.51 +    u_short ss_family;  /* address family */
    1.52 +    char        __ss_pad1[_SS_PAD1SIZE];
    1.53 +    __int64_t   __ss_align; /* force desired struct alignment */
    1.54 +    char        __ss_pad2[_SS_PAD2SIZE];
    1.55 +};
    1.56 +#endif
    1.57  #if __BSD_VISIBLE
    1.58  /*
    1.59   * Protocol families, same as address families for now.