Commits

Ruslan Osmanov committed b05dfda

Fix: make the code compatible with PHP 5.6.0-dev

  • Participants
  • Parent commits 653b9bf

Comments (0)

Files changed (2)

   Fix: address argument of the listener accept callback contained garbage in case of a client connected via UNIX domain socket
   Add: EventBuffer::write, EventUtil::setSocketOption methods and some constants
   Refact: automatically set the upper bound of EventBuffer::search to the buffer length, if it is greater then the length
+  Fix: make the code compatible with PHP 5.6.0-dev
   ]]></notes>
   <!--}}}-->
   <!--{{{ Contents -->
   Fix: address argument of the listener accept callback contained garbage in case of a client connected via UNIX domain socket
   Add: EventBuffer::write, EventUtil::setSocketOption methods and some constants
   Refact: automatically set the upper bound of EventBuffer::search to the buffer length, if it is greater then the length
+  Fix: make the code compatible with PHP 5.6.0-dev
   ]]></notes>
     </release>
     <!--}}}-->
 #endif    
 
 /* {{{ get_property_ptr_ptr */
+#if PHP_VERSION_ID >= 50600
+static zval **get_property_ptr_ptr(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC)
+#else
 static zval **get_property_ptr_ptr(zval *object, zval *member, const zend_literal *key TSRMLS_DC)
+#endif
 {
 	php_event_abstract_object_t  *obj;
 	zval                          tmp_member;
 	}
 
 	if (ret == FAILURE) {
+#if PHP_VERSION_ID >= 50600
+		retval = zend_get_std_object_handlers()->get_property_ptr_ptr(object, member, type, key TSRMLS_CC);
+#else
 		retval = zend_get_std_object_handlers()->get_property_ptr_ptr(object, member, key TSRMLS_CC);
+#endif
 	} else if (hnd->get_ptr_ptr_func) {
 		retval = hnd->get_ptr_ptr_func(obj TSRMLS_CC);
 	}