cvs: ZendEngine2(PHP_5_3) / zend_execute.h

pajoye		Tue Jun  9 09:26:03 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_execute.h 
  Log:
  - fix build (void alarm)
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.h?r1=1.84.2.4.2.8.2.14&r2=1.84.2.4.2.8.2.15&diff_format=u
Index: ZendEngine2/zend_execute.h
diff -u ZendEngine2/zend_execute.h:1.84.2.4.2.8.2.14 ZendEngine2/zend_execute.h:1.84.2.4.2.8.2.15
--- ZendEngine2/zend_execute.h:1.84.2.4.2.8.2.14	Fri Jun  5 18:50:32 2009
+++ ZendEngine2/zend_execute.h	Tue Jun  9 09:26:02 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.h,v 1.84.2.4.2.8.2.14 2009/06/05 18:50:32 mattwil Exp $ */
+/* $Id: zend_execute.h,v 1.84.2.4.2.8.2.15 2009/06/09 09:26:02 pajoye Exp $ */
 
 #ifndef ZEND_EXECUTE_H
 #define ZEND_EXECUTE_H
@@ -298,8 +298,8 @@
 
 	zend_ptr_stack_2_pop(stack, &a, &b);
 
-	*object = a;
-	*fbc = b;
+	*object = (zval *) a;
+	*fbc = (zend_function *) b;
 }
 
 static inline void zend_arg_types_stack_3_pop(zend_ptr_stack *stack, zend_class_entry **called_scope, zval **object, zend_function **fbc)
@@ -308,9 +308,9 @@
 
 	zend_ptr_stack_3_pop(stack, &a, &b, &c);
 
-	*called_scope = a;
-	*object = b;
-	*fbc = c;
+	*called_scope = (zend_class_entry *) a;
+	*object = (zval *) b;
+	*fbc = (zend_function *) c;
 }
 
 void execute_new_code(TSRMLS_D);