Merge branch 'PHP-5.3' into PHP-5.4

colder · colder · commit 5de1b08482cd · 2013-03-16T18:20:06.000+01:00
* PHP-5.3:
  Remove spurious int cast in between two longs
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
@@ -880,7 +880,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset)
 	}
 
 	intern = (spl_dllist_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
-	index  = (int)spl_offset_convert_to_long(zindex TSRMLS_CC);
+	index  = spl_offset_convert_to_long(zindex TSRMLS_CC);
     llist  = intern->llist;
 
     if (index < 0 || index >= intern->llist->count) {

Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset)`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`intern = (spl_dllist_object*)zend_object_store_get_object(getThis() TSRMLS_CC);`
`883`		`- index = (int)spl_offset_convert_to_long(zindex TSRMLS_CC);`
	`883`	`+ index = spl_offset_convert_to_long(zindex TSRMLS_CC);`
`884`	`884`	`llist = intern->llist;`
`885`	`885`
`886`	`886`	`if (index < 0 \|\| index >= intern->llist->count) {`