diff options
| author | kusano <kusano@users.noreply.github.com> | 2016-02-17 01:00:58 +0900 |
|---|---|---|
| committer | kusano <kusano@users.noreply.github.com> | 2016-02-17 01:00:58 +0900 |
| commit | 07cae46b02795f8364d28ecad6ec45f507e7114b (patch) | |
| tree | 47795fa54a8cf014e918d8bfe3056e9b30ec9b0e /main/internal_functions_win32.c | |
| parent | d31e8a9a85efea54db0b647424f6c4485d71db8b (diff) | |
| parent | 3244d3c7e936b23ad33892e367500f64468c6140 (diff) | |
| download | php-git-07cae46b02795f8364d28ecad6ec45f507e7114b.tar.gz | |
Merge branch 'master' into fix-mt_rand
Conflicts:
ext/standard/rand.c
Diffstat (limited to 'main/internal_functions_win32.c')
| -rw-r--r-- | main/internal_functions_win32.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index 45baf802c0..d64d9e82fb 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -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 |