diff options
| author | Remi Collet <remi@php.net> | 2017-08-02 14:03:23 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-08-02 14:03:23 +0200 |
| commit | 5e5895a4644dc30fb150e390ae62f248100ec87b (patch) | |
| tree | f0abbcee47b02c127fc0fd18578d905d6b4556d7 /ext/sqlite3/sqlite3.c | |
| parent | 6202c821a9a1500fc7a5a66602e47df06ef80f4d (diff) | |
| parent | 5f030924c19a39c09b57d40615f754cf80ae0e7d (diff) | |
| download | php-git-5e5895a4644dc30fb150e390ae62f248100ec87b.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix build with old system libsqlite (sqlite3_errstr may be missing)
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index a74ff8d971..cdd17bd159 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -140,7 +140,11 @@ PHP_METHOD(sqlite3, open) #endif if (rc != SQLITE_OK) { zend_throw_exception_ex(zend_ce_exception, 0, "Unable to open database: %s", +#ifdef HAVE_SQLITE3_ERRSTR db_obj->db ? sqlite3_errmsg(db_obj->db) : sqlite3_errstr(rc)); +#else + db_obj->db ? sqlite3_errmsg(db_obj->db) : ""); +#endif if (fullpath != filename) { efree(fullpath); } |