diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:25:10 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:25:10 -0800 |
| commit | 7daa97a3831f4b21eaee656415784538e686ba04 (patch) | |
| tree | 6524d109e00da32931636142c5200421d8c908de /Zend/zend_vm_opcodes.h | |
| parent | b4ef6a91acf2c97a43fbcc8fd9b6785f63ff5cf0 (diff) | |
| parent | 5a3e236bd5f40d17812b4da23ef19a4f4f67abc6 (diff) | |
| download | php-git-7daa97a3831f4b21eaee656415784538e686ba04.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix NEWS order
update NEWS
Update the VM generation script, per Bob.
Update NEWS after rebase.
Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
Diffstat (limited to 'Zend/zend_vm_opcodes.h')
| -rw-r--r-- | Zend/zend_vm_opcodes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index c06fd84ff4..9d969877e0 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -21,8 +21,12 @@ #ifndef ZEND_VM_OPCODES_H #define ZEND_VM_OPCODES_H +BEGIN_EXTERN_C() + ZEND_API const char *zend_get_opcode_name(zend_uchar opcode); +END_EXTERN_C() + #define ZEND_NOP 0 #define ZEND_ADD 1 #define ZEND_SUB 2 |