cvs: ZendEngine2(PHP_5_3) / zend.h
| From: | Dmitry Stogov | Date: | Tue, 20 Nov 2007 10:19:11 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_3) / zend.h | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-6175@lists.php.net to get a copy of this message | ||
dmitry Tue Nov 20 10:19:11 2007 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend.h
Log:
Fixed compilation on some systems (Wez)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.9&r2=1.293.2.11.2.9.2.10&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.9 ZendEngine2/zend.h:1.293.2.11.2.9.2.10
--- ZendEngine2/zend.h:1.293.2.11.2.9.2.9 Fri Nov 2 19:40:37 2007
+++ ZendEngine2/zend.h Tue Nov 20 10:19:11 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.h,v 1.293.2.11.2.9.2.9 2007/11/02 19:40:37 jani Exp $ */
+/* $Id: zend.h,v 1.293.2.11.2.9.2.10 2007/11/20 10:19:11 dmitry Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -248,10 +248,8 @@
#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, return_value_ptr, this_ptr,
return_value_used TSRMLS_CC
#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) &&
!defined(__hpux) && !defined(_AIX) && !defined(__osf__)
-# define ZEND_VM_ALWAYS_INLINE __attribute__ ((always_inline))
void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
#else
-# define ZEND_VM_ALWAYS_INLINE
# define zend_error_noreturn zend_error
#endif
@@ -324,42 +322,42 @@
#define Z_SET_ISREF_TO(z, isref) Z_SET_ISREF_TO_P(&(z), isref)
#if defined(__GNUC__)
-#define always_inline inline __attribute__((always_inline))
+#define zend_always_inline inline __attribute__((always_inline))
#elif defined(_MSC_VER)
-#define always_inline __forceinline
+#define zend_always_inline __forceinline
#else
-#define always_inline inline
+#define zend_always_inline inline
#endif
-static always_inline zend_uint zval_refcount_p(zval* pz) {
+static zend_always_inline zend_uint zval_refcount_p(zval* pz) {
return pz->refcount__gc;
}
-static always_inline zend_uint zval_set_refcount_p(zval* pz, zend_uint rc) {
+static zend_always_inline zend_uint zval_set_refcount_p(zval* pz, zend_uint rc) {
return pz->refcount__gc = rc;
}
-static always_inline zend_uint zval_addref_p(zval* pz) {
+static zend_always_inline zend_uint zval_addref_p(zval* pz) {
return ++pz->refcount__gc;
}
-static always_inline zend_uint zval_delref_p(zval* pz) {
+static zend_always_inline zend_uint zval_delref_p(zval* pz) {
return --pz->refcount__gc;
}
-static always_inline zend_bool zval_isref_p(zval* pz) {
+static zend_always_inline zend_bool zval_isref_p(zval* pz) {
return pz->is_ref__gc;
}
-static always_inline zend_bool zval_set_isref_p(zval* pz) {
+static zend_always_inline zend_bool zval_set_isref_p(zval* pz) {
return pz->is_ref__gc = 1;
}
-static always_inline zend_bool zval_unset_isref_p(zval* pz) {
+static zend_always_inline zend_bool zval_unset_isref_p(zval* pz) {
return pz->is_ref__gc = 0;
}
-static always_inline zend_bool zval_set_isref_to_p(zval* pz, zend_bool isref) {
+static zend_always_inline zend_bool zval_set_isref_to_p(zval* pz, zend_bool isref) {
return pz->is_ref__gc = isref;
}