diff options
Diffstat (limited to 'src/stdafx.h')
| -rw-r--r-- | src/stdafx.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index c854e4a61..6c6a21ec7 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -290,10 +290,18 @@ assert_compile(sizeof(uint8) == 1); #define lengthof(x) (sizeof(x)/sizeof(x[0])) #define endof(x) (&x[lengthof(x)]) #define lastof(x) (&x[lengthof(x) - 1]) -#ifndef offsetof -# define offsetof(s,m) (size_t)&(((s *)0)->m) + +#ifdef offsetof +# undef offsetof #endif +#ifndef __cplusplus +# 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) +#endif /* __cplusplus */ + // take care of some name clashes on macos #if defined(__APPLE__) |