diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 13:18:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 13:18:53 +0200 |
| commit | 96daf181a689407301a5bc6a8761f4ba9bc47c15 (patch) | |
| tree | 538077c34664375c793ca1b1a6aa0188dcf624bd /main/php.h | |
| parent | 98495f7f309fd7774357001ee6613cc56a22ed0a (diff) | |
| parent | e2c3bc80e3ac49443cb1b5f2a601db6186459f7a (diff) | |
| download | php-git-96daf181a689407301a5bc6a8761f4ba9bc47c15.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/main/php.h b/main/php.h index 222f884b26..2d0a1f8ce1 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 |