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 /win32 | |
| 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 'win32')
| -rw-r--r-- | win32/build/config.w32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 6e19c48967..0caa3c66f7 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -357,7 +357,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \ zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \ zend_constants.c zend_dynamic_array.c zend_exceptions.c \ zend_execute_API.c zend_highlight.c \ - zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \ + zend_llist.c zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c \ zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \ zend_hash.c zend_list.c zend_indent.c zend_builtin_functions.c \ zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \ |