cvs: ZendEngine2(PHP_5_3) / zend_execute.h

dmitry		Tue Jan 29 11:12:07 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_execute.h 
  Log:
  Fixed types
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.h?r1=1.84.2.4.2.8.2.4&r2=1.84.2.4.2.8.2.5&diff_format=u
Index: ZendEngine2/zend_execute.h
diff -u ZendEngine2/zend_execute.h:1.84.2.4.2.8.2.4 ZendEngine2/zend_execute.h:1.84.2.4.2.8.2.5
--- ZendEngine2/zend_execute.h:1.84.2.4.2.8.2.4	Mon Jan 28 23:55:53 2008
+++ ZendEngine2/zend_execute.h	Tue Jan 29 11:12:07 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.h,v 1.84.2.4.2.8.2.4 2008/01/28 23:55:53 stas Exp $ */
+/* $Id: zend_execute.h,v 1.84.2.4.2.8.2.5 2008/01/29 11:12:07 dmitry Exp $ */
 
 #ifndef ZEND_EXECUTE_H
 #define ZEND_EXECUTE_H
@@ -227,20 +227,20 @@
 	size = (size + (sizeof(void*) - 1)) / sizeof(void*);
 
 	ZEND_VM_STACK_GROW_IF_NEEDED(size);
-	ret = EG(argument_stack)->top;
+	ret = (void*)EG(argument_stack)->top;
 	EG(argument_stack)->top += size;
 	return ret;
 }
 
 static inline void zend_vm_stack_free(void *ptr TSRMLS_DC)
 {	
-	if (UNEXPECTED(EG(argument_stack)->elements == ptr)) {
+	if (UNEXPECTED(EG(argument_stack)->elements == (void**)ptr)) {
 		zend_vm_stack p = EG(argument_stack);
 
 		EG(argument_stack) = p->prev;
 		efree(p);
 	} else {
-		EG(argument_stack)->top = ptr;
+		EG(argument_stack)->top = (void**)ptr;
 	}
 }