diff options
| author | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
|---|---|---|
| committer | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
| commit | 8eb7e7bf7f63f49e97f112871df47c6d6213e715 (patch) | |
| tree | 24b9059118cf6abb5fe0837eaa477b4668b18435 /win32/build/config.w32 | |
| parent | 58ed832fc99d5c5aeac7849819bbc4e0dc90d698 (diff) | |
| parent | 95836a350420cabc2e8e5f5c45131fba46504a3b (diff) | |
| download | php-git-8eb7e7bf7f63f49e97f112871df47c6d6213e715.tar.gz | |
Merge branch 'master' into issue-67910
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
Diffstat (limited to 'win32/build/config.w32')
| -rw-r--r-- | win32/build/config.w32 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 1d2949c5ae..82378b536d 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -362,7 +362,8 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c \ zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \ - zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c"); + zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c \ + zend_inheritance.c"); if (VCVERS == 1200) { AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1); |