From 29a332e829c60107d484bacdd2ceb25fe3761089 Mon Sep 17 00:00:00 2001 From: KUDr Date: Fri, 26 Jan 2007 08:37:48 +0000 Subject: [PATCH] (svn r8413) -Fix [MORPHOS]: disable #define offsetof conflict on Morphos (seems that g++ 2.95 defines it anyway) --- src/stdafx.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/stdafx.h b/src/stdafx.h index 3de8652458..fb00c11fa6 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -310,7 +310,9 @@ assert_compile(sizeof(uint8) == 1); # 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 */