# HG changeset patch # User KUDr # Date 1169800668 0 # Node ID d59aa5885dccd58f45314fa4bfae239695b32c54 # Parent fa0fd287c6f1150bdf8217d1de08eff7841214fc (svn r8413) -Fix [MORPHOS]: disable #define offsetof conflict on Morphos (seems that g++ 2.95 defines it anyway) diff --git a/src/stdafx.h b/src/stdafx.h --- a/src/stdafx.h +++ b/src/stdafx.h @@ -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 */