From ef9ddd0d82960d5c52f3abc00458c1eabdc149ec Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Tue, 15 Dec 2015 16:39:43 +0200 Subject: [PATCH] Remove sqlite extension leftover references (was removed in PHP 5.4) --- .gitignore | 4 ---- main/internal_functions_win32.c | 6 ------ php.ini-development | 4 ---- php.ini-production | 4 ---- 4 files changed, 18 deletions(-) diff --git a/.gitignore b/.gitignore index e69463a240..0a4efddeca 100644 --- a/.gitignore +++ b/.gitignore @@ -219,10 +219,6 @@ ext/reflection/spl.chm ext/simplexml/examples/security.new.xml ext/spl/examples/.htaccess ext/spl/examples/*.phps -ext/sqlite/weztest.sqlite -ext/sqlite/libsqlite/src/sqlite.h -ext/sqlite/libsqlite/src/parse.out -ext/sqlite/libsqlite/src/libsqlite.dsw ext/sqlite3/tests/phpsql* ext/sqlite3/tests/*.db ext/sqlite3/tests/*.tmp diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index 6c8cf41658..49144e9fab 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -101,9 +101,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" @@ -176,9 +173,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 diff --git a/php.ini-development b/php.ini-development index dac7525149..f350476204 100644 --- a/php.ini-development +++ b/php.ini-development @@ -969,10 +969,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = diff --git a/php.ini-production b/php.ini-production index 4ee3310be5..e462003e10 100644 --- a/php.ini-production +++ b/php.ini-production @@ -969,10 +969,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = -- 2.40.0