From 44da54ec7f1826e3318202084e49a58a886a3f7b Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 21 May 2013 02:30:11 -0700 Subject: Rename some inheritance macros --- OpenAL32/Include/alMain.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenAL32') diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index a1a90b2f..4cdaf783 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -62,9 +62,9 @@ static const union { #define COUNTOF(x) (sizeof((x))/sizeof((x)[0])) -#define DERIVE_FROM_TYPE(t) t t##_parent -#define GET_DERIVED_TYPE(t, o) (&(o)->t##_parent) -#define GET_PARENT_TYPE(t1, t2, o) ((t1*)((char*)(o) - offsetof(t1, t2##_parent))) +#define DERIVE_FROM_TYPE(t) t t##_parent +#define STATIC_CAST(to, obj) (&(obj)->to##_parent) +#define STATIC_UPCAST(to, from, obj) ((to*)((char*)(obj) - offsetof(to, from##_parent))) #ifdef _WIN32 -- cgit v1.2.3