# HG changeset patch # User KUDr # Date 1169800668 0 # Node ID 98248c77597232fe3bec2577cf582d1719f4fd48 # Parent d3a1169d7ef4b0ed691a62ce59c0550b5a449e8f (svn r8413) -Fix [MORPHOS]: disable #define offsetof conflict on Morphos (seems that g++ 2.95 defines it anyway) diff -r d3a1169d7ef4 -r 98248c775972 src/stdafx.h --- a/src/stdafx.h Fri Jan 26 08:36:02 2007 +0000 +++ b/src/stdafx.h Fri Jan 26 08:37:48 2007 +0000 @@ -310,7 +310,9 @@ # define offsetof(s,m) (size_t)&(((s *)0)->m) #else /* __cplusplus */ # define cpp_offsetof(s,m) (((size_t)&reinterpret_cast((((s*)(char*)8)->m))) - 8) -# define offsetof(s,m) cpp_offsetof(s, m) +# ifndef __MORPHOS__ +# define offsetof(s,m) cpp_offsetof(s, m) +# endif /* !__MORPHOS__ */ #endif /* __cplusplus */