diff options
| author | Anatol Belski <ab@php.net> | 2015-10-23 10:16:51 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-10-23 10:16:51 +0200 |
| commit | 17eff65001d1fb8782e8906d32cb300e67869213 (patch) | |
| tree | 0664e868ef347037be19f82db41505dd62ffece9 | |
| parent | 334deefa2913cb4740e6bb30259dc65f3e07adc2 (diff) | |
| parent | 448d1ce428cd14453b908fdf721eb008d445474a (diff) | |
| download | php-git-17eff65001d1fb8782e8906d32cb300e67869213.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
rather use the supplied inttypes.h with vc14
fix test redirection when run not from source root
| -rw-r--r-- | ext/pdo_pgsql/tests/common.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_sqlite/tests/common.phpt | 2 | ||||
| -rw-r--r-- | win32/php_inttypes.h | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ext/pdo_pgsql/tests/common.phpt b/ext/pdo_pgsql/tests/common.phpt index 8a21371bf9..e764b39839 100644 --- a/ext/pdo_pgsql/tests/common.phpt +++ b/ext/pdo_pgsql/tests/common.phpt @@ -8,7 +8,7 @@ if (!extension_loaded('pdo_pgsql')) print 'skip'; ?> # Also update config.inc if you make changes here... $config = array( - 'TESTS' => 'ext/pdo/tests' + 'TESTS' => __DIR__ . '/ext/pdo/tests' ); if (false !== getenv('PDO_PGSQL_TEST_DSN')) { diff --git a/ext/pdo_sqlite/tests/common.phpt b/ext/pdo_sqlite/tests/common.phpt index 65ea0c96f4..da28d91950 100644 --- a/ext/pdo_sqlite/tests/common.phpt +++ b/ext/pdo_sqlite/tests/common.phpt @@ -8,5 +8,5 @@ return array( 'ENV' => array( 'PDOTEST_DSN' => 'sqlite::memory:' ), - 'TESTS' => 'ext/pdo/tests' + 'TESTS' => __DIR__ . '/ext/pdo/tests' ); diff --git a/win32/php_inttypes.h b/win32/php_inttypes.h index ead903f78e..4130649cf2 100644 --- a/win32/php_inttypes.h +++ b/win32/php_inttypes.h @@ -33,6 +33,10 @@ #error "Use this header only with Microsoft Visual C++ compilers!" #endif // _MSC_VER ] +// Starting with vc14, many of the C11 features are now included, so we only +// need many of these typedefs and defines for older VS suites +#if _MSC_VER < 1900 + #ifndef _MSC_INTTYPES_H_ // [ #define _MSC_INTTYPES_H_ @@ -303,3 +307,8 @@ imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) #endif // _MSC_INTTYPES_H_ ] + +#else +#include <inttypes.h> +#endif + |