diff options
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/php.h b/main/php.h index 370cb7ba2..edfa6e073 100644 --- a/main/php.h +++ b/main/php.h @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.221.2.2 2006/01/01 12:50:17 sniper Exp $ */ +/* $Id: php.h,v 1.221.2.4 2006/03/07 22:37:53 alexwaugh Exp $ */ #ifndef PHP_H #define PHP_H @@ -340,7 +340,9 @@ END_EXTERN_C() #define PHP_NAMED_FE ZEND_NAMED_FE #define PHP_FE ZEND_FE +#define PHP_DEP_FE ZEND_DEP_FE #define PHP_FALIAS ZEND_FALIAS +#define PHP_DEP_FALIAS ZEND_DEP_FALIAS #define PHP_ME ZEND_ME #define PHP_MALIAS ZEND_MALIAS #define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME @@ -415,7 +417,7 @@ END_EXTERN_C() */ #ifndef XtOffset -#if defined(CRAY) || (defined(__arm) && !defined(LINUX)) +#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__))) #ifdef __STDC__ #define XtOffset(p_type, field) _Offsetof(p_type, field) #else |