1c1,2
< /* Copyright (C) 1989, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
---
> /* Copyright (C) 1989, 1997, 1998, 1999, 2000, 2002, 2004
> Free Software Foundation, Inc.
17,18c18,19
< the Free Software Foundation, 59 Temple Place - Suite 330,
< Boston, MA 02111-1307, USA. */
---
> the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> Boston, MA 02110-1301, USA. */
298c299
< /* Why is this file so hard to maintain properly? In constrast to
---
> /* Why is this file so hard to maintain properly? In contrast to
413,422c414,415
< #ifndef __cplusplus
< #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
< #else
< /* The cast to "char &" below avoids problems with user-defined
< "operator &", which can appear in a POD type. */
< #define offsetof(TYPE, MEMBER) \
< (__offsetof__ (reinterpret_cast <size_t> \
< (&reinterpret_cast <const volatile char &> \
< (static_cast<TYPE *> (0)->MEMBER))))
< #endif /* C++ */
---
> #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER)
>