com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_v m_gen.php Zend/zend_vm_opcodes.h

From: Date: Sat, 21 Dec 2013 20:32:42 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_v m_gen.php Zend/zend_vm_opcodes.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75380@lists.php.net to get a copy of this message
Commit: b14f31872bd94d7c0d58048a4500dae868022324 Author: Bob Weinand <bobwei9@hotmail.com> Sat, 21 Dec 2013 21:32:42 +0100 Parents: 9b4b5fa737ec8a63b073af7afeec8d26aa2bccf1 560f90e5117b94bf16e6698e372e981d7bbb38e5 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b14f31872bd94d7c0d58048a4500dae868022324 Log: Merge branch 'PHP-5.5' into PHP-5.6 Changed paths: MM Zend/zend_vm_gen.php MM Zend/zend_vm_opcodes.h Diff: diff --cc Zend/zend_vm_opcodes.h index 663e216,18bb0d2..672f223 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@@ -167,9 -167,8 +167,9 @@@ #define ZEND_GENERATOR_RETURN 161 #define ZEND_FAST_CALL 162 #define ZEND_FAST_RET 163 +#define ZEND_RECV_VARIADIC 164 - const char *zend_vm_opcodes_map[] = { + static const char *zend_vm_opcodes_map[] = { "ZEND_NOP", "ZEND_ADD", "ZEND_SUB",

« previous php.cvs (#75380) next »