diff options
| author | KUDr <kudr@openttd.org> | 2007-01-26 08:37:48 +0000 |
|---|---|---|
| committer | KUDr <kudr@openttd.org> | 2007-01-26 08:37:48 +0000 |
| commit | 29a332e829c60107d484bacdd2ceb25fe3761089 (patch) | |
| tree | 716a1e142a886956378b37122f0af47b8ee93366 /src | |
| parent | 40f966958e1b3bbff698de783b224cd08bc1359e (diff) | |
| download | openttd-29a332e829c60107d484bacdd2ceb25fe3761089.tar.xz | |
(svn r8413) -Fix [MORPHOS]: disable #define offsetof conflict on Morphos (seems that g++ 2.95 defines it anyway)
Diffstat (limited to 'src')
| -rw-r--r-- | src/stdafx.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index 3de865245..fb00c11fa 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<const volatile char&>((((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 */ |