diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-17 14:30:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-17 14:30:00 +0800 |
| commit | 9374977d215be414d6e2e98b041a2b8f9b9a1e8d (patch) | |
| tree | 15b28cb867460a81ac1956cd8c241cd23e1c9827 /main/internal_functions_win32.c | |
| parent | c7c3b967a550b4f1137d6a7b2bf56ec1e4f6dbbd (diff) | |
| parent | 940c68b55d4241f9f34d4f71064f5f12a44e8d3d (diff) | |
| download | php-git-9374977d215be414d6e2e98b041a2b8f9b9a1e8d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/opcache/Optimizer/pass1_5.c
Diffstat (limited to 'main/internal_functions_win32.c')
| -rw-r--r-- | main/internal_functions_win32.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index 45baf802c0..68633bcdc8 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -97,9 +97,6 @@ #if HAVE_XML && HAVE_WDDX #include "ext/wddx/php_wddx.h" #endif -#ifdef HAVE_SQLITE -#include "ext/sqlite/php_sqlite.h" -#endif #include "ext/com_dotnet/php_com_dotnet.h" #ifdef HAVE_SPL #include "ext/spl/php_spl.h" @@ -172,9 +169,6 @@ static zend_module_entry *php_builtin_extensions[] = { #if HAVE_XML && HAVE_WDDX ,phpext_wddx_ptr #endif -#if HAVE_SQLITE - ,phpext_sqlite_ptr -#endif #if HAVE_SPL ,phpext_spl_ptr #endif |