diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-06 22:15:35 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-06 22:15:35 -0700 |
| commit | c291033469920fa2155b3b1833731a0aa93257c3 (patch) | |
| tree | 0d05bed9eb987104137bce21c539800d63c68c28 | |
| parent | 2034ace0526657cbed0fafc3d77b1baa6604ae9e (diff) | |
| parent | 716d2a3937b4590772212b563127810eb4aad672 (diff) | |
| download | php-git-c291033469920fa2155b3b1833731a0aa93257c3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
| -rw-r--r-- | Zend/zend_vm_gen.php | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_opcodes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 5da3405dd7..08657e5f31 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -1189,7 +1189,7 @@ function gen_vm($def, $skel) { fputs($f,"#define $op $code\n"); } - fputs($f, "\n#endif"); + fputs($f, "\n#endif\n"); fclose($f); echo "zend_vm_opcodes.h generated successfully.\n"; diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index 911eee4434..4ed726d217 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -170,4 +170,4 @@ ZEND_API const char *zend_get_opcode_name(zend_uchar opcode); #define ZEND_FAST_CALL 162 #define ZEND_FAST_RET 163 -#endif
\ No newline at end of file +#endif |