diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2013-12-22 13:11:20 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2013-12-22 13:11:20 +0000 |
| commit | 2a1b60569fda7b9ca949f557c617d2555014e9fd (patch) | |
| tree | 90045e96d16ca7504b1708970776cf9ad040d9fd /Zend/zend_language_scanner.c | |
| parent | b14f31872bd94d7c0d58048a4500dae868022324 (diff) | |
| parent | 247ec0d81f1ebe16cafa082ba3ef73ca1f31831d (diff) | |
| download | php-git-2a1b60569fda7b9ca949f557c617d2555014e9fd.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
stop warnings from unused opcode map
- BFN
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Included new .c file in build too
Fixed little typo in zend_vm_gen.php
Moved to new file, killing a lot of warnings
Diffstat (limited to 'Zend/zend_language_scanner.c')
| -rw-r--r-- | Zend/zend_language_scanner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 76e3e56451..22ac9fa3aa 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 */ +/* Generated by re2c 0.13.5 on Sun Dec 22 13:03:33 2013 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ |