diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:17:17 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:17:17 -0800 |
| commit | 9ef264504d32f0218db302a8c16939165ee04a8f (patch) | |
| tree | 197b1ede8cb36193c02907b3fe8cd85d76abf1d5 | |
| parent | 6d148f7ed97ec55439c378577c4373e03842414e (diff) | |
| parent | 4bb836be207db33bb5ef69766f46acb60a554e30 (diff) | |
| download | php-git-9ef264504d32f0218db302a8c16939165ee04a8f.tar.gz | |
Merge branch 'pull-request/840' into PHP-5.5
* pull-request/840:
Update the VM generation script, per Bob.
Update NEWS after rebase.
Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
| -rw-r--r-- | Zend/zend_float.h | 4 | ||||
| -rw-r--r-- | Zend/zend_vm.h | 4 | ||||
| -rw-r--r-- | Zend/zend_vm_gen.php | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_opcodes.h | 4 |
4 files changed, 14 insertions, 0 deletions
diff --git a/Zend/zend_float.h b/Zend/zend_float.h index 33f8e93fbf..d9e4f4be88 100644 --- a/Zend/zend_float.h +++ b/Zend/zend_float.h @@ -21,6 +21,8 @@ #ifndef ZEND_FLOAT_H #define ZEND_FLOAT_H +BEGIN_EXTERN_C() + /* Define functions for FP initialization and de-initialization. */ @@ -28,6 +30,8 @@ extern ZEND_API void zend_init_fpu(TSRMLS_D); extern ZEND_API void zend_shutdown_fpu(TSRMLS_D); extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D); +END_EXTERN_C() + /* Copy of the contents of xpfpa.h (which is under public domain) See http://wiki.php.net/rfc/rounding for details. diff --git a/Zend/zend_vm.h b/Zend/zend_vm.h index 078be15b74..e403e7cc92 100644 --- a/Zend/zend_vm.h +++ b/Zend/zend_vm.h @@ -21,9 +21,13 @@ #ifndef ZEND_VM_H #define ZEND_VM_H +BEGIN_EXTERN_C() + ZEND_API void zend_vm_use_old_executor(void); ZEND_API void zend_vm_set_opcode_handler(zend_op* opcode); +END_EXTERN_C() + #define ZEND_VM_SET_OPCODE_HANDLER(opline) zend_vm_set_opcode_handler(opline) #endif diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 08657e5f31..41febfa44d 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -1181,7 +1181,9 @@ function gen_vm($def, $skel) { out($f, $GLOBALS['header_text']); fputs($f, "#ifndef ZEND_VM_OPCODES_H\n#define ZEND_VM_OPCODES_H\n\n"); + fputs($f, "BEGIN_EXTERN_C()\n\n"); fputs($f, "ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);\n\n"); + fputs($f, "END_EXTERN_C()\n\n"); foreach ($opcodes as $code => $dsc) { $code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT); diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index 4ed726d217..89a1afad49 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 |