From e2c3bc80e3ac49443cb1b5f2a601db6186459f7a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 12 Jul 2019 13:18:18 +0200 Subject: Remove duplicate XtOffsetOf() definitions in php.h These are already defined in zend_portability.h. --- main/php.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'main/php.h') diff --git a/main/php.h b/main/php.h index 480da6fb18..4bc054539c 100644 --- a/main/php.h +++ b/main/php.h @@ -448,39 +448,4 @@ END_EXTERN_C() #include "php_reentrancy.h" -/* Finding offsets of elements within structures. - * Taken from the Apache code, which in turn, was taken from X code... - */ - -#ifndef XtOffset -#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__))) -#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 */ -#endif /* ! XtOffset */ - -#ifndef XtOffsetOf -#ifdef offsetof -#define XtOffsetOf(s_type, field) offsetof(s_type, field) -#else -#define XtOffsetOf(s_type, field) XtOffset(s_type*, field) -#endif -#endif /* !XtOffsetOf */ - #endif -- cgit v1.2.1