From 917e28d77e51dbce244f508baeccd7028c928225 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 30 Jun 2020 14:39:49 +0200 Subject: [PATCH] Assume offsetof() exists This is a standard C macro. Define XtOffsetOf as an alias for compatibility, as this is the name we use in most code right now. --- Zend/zend_portability.h | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index 631ebb29f2..b94ed7b55f 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -329,28 +329,7 @@ char *alloca(); #endif #ifndef XtOffsetOf -# if defined(CRAY) || (defined(__ARMCC_VERSION) && !defined(LINUX)) -# ifdef __STDC__ -# define XtOffset(p_type, field) _Offsetof(p_type, field) -# else -# ifdef CRAY2 -# define XtOffset(p_type, field) \ - (sizeof(int)*((unsigned int)&(((p_type)NULL)->field))) -# else /* !CRAY2 */ -# define XtOffset(p_type, field) ((unsigned int)&(((p_type)NULL)->field)) -# endif /* !CRAY2 */ -# endif /* __STDC__ */ -# else /* ! (CRAY || __arm) */ -# define XtOffset(p_type, field) \ - ((zend_long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL))) -# endif /* !CRAY */ - -# ifdef offsetof # define XtOffsetOf(s_type, field) offsetof(s_type, field) -# else -# define XtOffsetOf(s_type, field) XtOffset(s_type*, field) -# endif - #endif #if (defined(HAVE_ALLOCA) || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) -- 2.40.0