com php-src: Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir: NEWS ext/pdo/ config.m4 ext/pdo/config.w32

Commit: 7fd9898a2d00d3df95d581df0fe67d91ced86661 Author: Matteo Beccati <mbeccati@php.net> Sun, 13 Apr 2014 08:53:21 +0200 Parents: aefc8f22b35999624f3a579696cf68b389f41ae8 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7fd9898a2d00d3df95d581df0fe67d91ced86661 Log: Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir Bugs: https://bugs.php.net/66604 Changed paths: M NEWS M ext/pdo/config.m4 M ext/pdo/config.w32 Diff: diff --git a/NEWS b/NEWS index 48afea4..e98d823 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,10 @@ PHP NEWS - mysqlnd: . Added a new fetching mode to mysqlnd. (Andrey) +- PDO: + . Fixed bug #66604 ('pdo/php_pdo_error.h' not copied to the include dir). + (Matteo) + - SQLite: . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol) diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4 index f8515dd..786c703 100755 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -60,7 +60,7 @@ for more detail on this issue. ifdef([PHP_INSTALL_HEADERS], [ dnl Sadly, this is a complete NOP for pecl extensions - PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h]) + PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h]) ]) dnl so we always include the known-good working hack. diff --git a/ext/pdo/config.w32 b/ext/pdo/config.w32 index c85f2e5..b026590 100755 --- a/ext/pdo/config.w32 +++ b/ext/pdo/config.w32 @@ -6,5 +6,5 @@ ARG_ENABLE("pdo", "Enable PHP Data Objects support", "no"); if (PHP_PDO != "no") { EXTENSION('pdo', 'pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c', false /* force static, PHP_PDO_SHARED is broken yet somehow */); ADD_EXTENSION_DEP('pdo', 'spl', true); - PHP_INSTALL_HEADERS("ext/pdo", "php_pdo.h php_pdo_driver.h"); + PHP_INSTALL_HEADERS("ext/pdo", "php_pdo.h php_pdo_driver.h php_pdo_error.h"); }