*** /usr/include/sys/types.h	Tue May 17 09:51:46 2005
--- /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/include/sys/types.h	Wed Sep  8 01:09:41 2004
***************
*** 1,3 ****
--- 1,12 ----
+ /*  DO NOT EDIT THIS FILE.
+ 
+     It has been auto-edited by fixincludes from:
+ 
+ 	"/usr/include/sys/types.h"
+ 
+     This had to be done to correct non-standard usages in the
+     original, manufacturer supplied header file.  */
+ 
  /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
  /*	  All Rights Reserved  	*/
  
***************
*** 6,12 ****
  /*	actual or intended publication of such source code.	*/
  
  /*
!  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
--- 15,21 ----
  /*	actual or intended publication of such source code.	*/
  
  /*
!  * Copyright 1996-2002 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
***************
*** 13,19 ****
  #ifndef _SYS_TYPES_H
  #define	_SYS_TYPES_H
  
! #pragma ident	"@(#)types.h	1.75	04/01/06 SMI"
  
  #include <sys/isa_defs.h>
  #include <sys/feature_tests.h>
--- 22,28 ----
  #ifndef _SYS_TYPES_H
  #define	_SYS_TYPES_H
  
! #pragma ident	"@(#)types.h	1.72	02/03/23 SMI"
  
  #include <sys/isa_defs.h>
  #include <sys/feature_tests.h>
***************
*** 89,102 ****
  typedef	long		daddr_t;	/* <disk address> type */
  typedef	short		cnt_t;		/* ?<count> type */
  
! #if !defined(_PTRDIFF_T) || __cplusplus >= 199711L
  #define	_PTRDIFF_T
  #if defined(_LP64) || defined(_I32LPx)
! typedef	long	ptrdiff_t;		/* pointer difference */
  #else
! typedef	int	ptrdiff_t;		/* (historical version) */
  #endif
  #endif
  
  /*
   * VM-related types
--- 98,119 ----
  typedef	long		daddr_t;	/* <disk address> type */
  typedef	short		cnt_t;		/* ?<count> type */
  
! #ifndef	_PTRDIFF_T
  #define	_PTRDIFF_T
  #if defined(_LP64) || defined(_I32LPx)
! #if !defined(_GCC_PTRDIFF_T)
! #define _GCC_PTRDIFF_T
! typedef __PTRDIFF_TYPE__ ptrdiff_t;
! #endif
! 		/* pointer difference */
  #else
! #if !defined(_GCC_PTRDIFF_T)
! #define _GCC_PTRDIFF_T
! typedef __PTRDIFF_TYPE__ ptrdiff_t;
  #endif
+ 		/* (historical version) */
  #endif
+ #endif
  
  /*
   * VM-related types
***************
*** 177,192 ****
  #endif /* defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) */
  
  /*
!  * The {u,}pad64_t types can be used in structures such that those structures
   * may be accessed by code produced by compilation environments which don't
!  * support a 64 bit integral datatype.  The intention is not to allow
   * use of these fields in such environments, but to maintain the alignment
   * and offsets of the structure.
-  *
-  * Similar comments for {u,}pad128_t.
-  *
-  * Note that these types do NOT generate any stronger alignment constraints
-  * than those available in the underlying ABI. See <sys/isa_list.h>
   */
  #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
  typedef int64_t		pad64_t;
--- 194,204 ----
  #endif /* defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) */
  
  /*
!  * The [u]pad64_t is to be used in structures such that those structures
   * may be accessed by code produced by compilation environments which don't
!  * support a 64 bit integral datatype.  This intention is not to allow
   * use of these fields in such environments, but to maintain the alignment
   * and offsets of the structure.
   */
  #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
  typedef int64_t		pad64_t;
***************
*** 202,221 ****
  } upad64_t;
  #endif
  
- typedef union {
- 	long double	_q;
- 	int32_t		_l[4];
- } pad128_t;
- 
- typedef union {
- 	long double	_q;
- 	uint32_t	_l[4];
- } upad128_t;
- 
  typedef	longlong_t	offset_t;
  typedef	u_longlong_t	u_offset_t;
  typedef u_longlong_t	len_t;
! typedef	u_longlong_t	diskaddr_t;
  
  /*
   * Definitions remaining from previous partial support for 64-bit file
--- 214,223 ----
  } upad64_t;
  #endif
  
  typedef	longlong_t	offset_t;
  typedef	u_longlong_t	u_offset_t;
  typedef u_longlong_t	len_t;
! typedef	longlong_t	diskaddr_t;
  
  /*
   * Definitions remaining from previous partial support for 64-bit file
***************
*** 244,250 ****
  
  #ifdef _LONG_LONG_LTOH
  typedef union {
! 	longlong_t	_f;	/* Full 64 bit disk address value */
  	struct {
  		int32_t	_l;	/* lower 32 bits of disk address value */
  		int32_t	_u;	/* upper 32 bits of disk address value */
--- 246,252 ----
  
  #ifdef _LONG_LONG_LTOH
  typedef union {
! 	diskaddr_t	_f;	/* Full 64 bit disk address value */
  	struct {
  		int32_t	_l;	/* lower 32 bits of disk address value */
  		int32_t	_u;	/* upper 32 bits of disk address value */
***************
*** 254,260 ****
  
  #ifdef _LONG_LONG_HTOL
  typedef union {
! 	longlong_t	_f;	/* Full 64 bit disk address value */
  	struct {
  		int32_t	_u;	/* upper 32 bits of disk address value */
  		int32_t	_l;	/* lower 32 bits of disk address value */
--- 256,262 ----
  
  #ifdef _LONG_LONG_HTOL
  typedef union {
! 	diskaddr_t	_f;	/* Full 64 bit disk address value */
  	struct {
  		int32_t	_u;	/* upper 32 bits of disk address value */
  		int32_t	_l;	/* lower 32 bits of disk address value */
***************
*** 455,464 ****
  #ifndef _SIZE_T
  #define	_SIZE_T
  #if defined(_LP64) || defined(_I32LPx)
! typedef	ulong_t	size_t;		/* size of something in bytes */
  #else
! typedef	uint_t	size_t;		/* (historical version) */
  #endif
  #endif	/* _SIZE_T */
  
  #ifndef _SSIZE_T
--- 457,474 ----
  #ifndef _SIZE_T
  #define	_SIZE_T
  #if defined(_LP64) || defined(_I32LPx)
! #if !defined(_GCC_SIZE_T)
! #define _GCC_SIZE_T
! typedef __SIZE_TYPE__ size_t;
! #endif
! 		/* size of something in bytes */
  #else
! #if !defined(_GCC_SIZE_T)
! #define _GCC_SIZE_T
! typedef __SIZE_TYPE__ size_t;
  #endif
+ 		/* (historical version) */
+ #endif
  #endif	/* _SIZE_T */
  
  #ifndef _SSIZE_T