com php-src: fix conflicting types: ext/opcache/zend_persist .c

From: Date: Fri, 06 Dec 2013 00:13:30 +0000
Subject: com php-src: fix conflicting types: ext/opcache/zend_persist .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74261@lists.php.net to get a copy of this message
Commit: c253fbda9a352f6368c1566d3e5db9e96e249a36 Author: Anatol Belski <ab@php.net> Thu, 5 Dec 2013 16:13:30 -0800 Parents: adb1e38468dcd50219c594ff2f71bb4d27ee01a4 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c253fbda9a352f6368c1566d3e5db9e96e249a36 Log: fix conflicting types Changed paths: M ext/opcache/zend_persist.c Diff: diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index 17147ac..d23005e 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -694,7 +694,7 @@ static void zend_accel_persist_class_table(HashTable *class_table TSRMLS_DC) zend_hash_apply(class_table, (apply_func_t) zend_update_parent_ce TSRMLS_CC); } -zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, unsigned int key_length TSRMLS_DC) +zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, zend_str_size_uint key_length TSRMLS_DC) { zend_shared_alloc_clear_xlat_table(); zend_hash_persist(&script->function_table, (zend_persist_func_t) zend_persist_op_array, sizeof(zend_op_array) TSRMLS_CC);

« previous php.cvs (#74261) next »