diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-23 03:43:55 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-23 03:43:55 +0300 |
| commit | 801768f72ceb5682b3bc6c10827f747d93753a58 (patch) | |
| tree | a46d550422051bb40d48a6bb58d983f9cc219453 | |
| parent | 6d4da2db8a5e77391182db271e1ed8e4e56eca88 (diff) | |
| parent | 1ce220624456929649d95ae31d0a8c318e25c68e (diff) | |
| download | php-git-801768f72ceb5682b3bc6c10827f747d93753a58.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
libpq versions older than 9.3 do not have lo_lseek64
fix include with vc14
fix compilation with vc14
improve zpp readme
| -rw-r--r-- | README.PARAMETER_PARSING_API | 2 | ||||
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 2 | ||||
| -rw-r--r-- | ext/standard/string.c | 5 | ||||
| -rw-r--r-- | win32/signal.h | 4 |
4 files changed, 10 insertions, 3 deletions
diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API index 2d1f1c522b..097b4978a5 100644 --- a/README.PARAMETER_PARSING_API +++ b/README.PARAMETER_PARSING_API @@ -59,7 +59,7 @@ Type specifiers h - array (returned as HashTable*) H - array or HASH_OF(object) (returned as HashTable*) l - long (zend_long) - L - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (zend_long) + L - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (zend_long, ZEND_LONG_MAX/ZEND_LONG_MIN) o - object of any type (zval*) O - object of specific type given by class entry (zval*, zend_class_entry) p - valid path (string without null bytes in the middle) and its length (char*, size_t) diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 1c760dc94b..4c907cc631 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -155,7 +155,7 @@ static int pgsql_lob_seek(php_stream *stream, zend_off_t offset, int whence, zend_off_t *newoffset) { struct pdo_pgsql_lob_self *self = (struct pdo_pgsql_lob_self*)stream->abstract; -#if ZEND_ENABLE_ZVAL_LONG64 +#if HAVE_PG_LO64 && ZEND_ENABLE_ZVAL_LONG64 zend_off_t pos = lo_lseek64(self->conn, self->lfd, offset, whence); #else zend_off_t pos = lo_lseek(self->conn, self->lfd, offset, whence); diff --git a/ext/standard/string.c b/ext/standard/string.c index 01a87fe919..6fef45bb63 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -197,7 +197,10 @@ PHPAPI struct lconv *localeconv_r(struct lconv *out) tsrm_mutex_lock( locale_mutex ); # endif -#if defined(PHP_WIN32) && defined(ZTS) +/* cur->locinfo is struct __crt_locale_info which implementation is + hidden in vc14. TODO revisit this and check if a workaround available + and needed. */ +#if defined(PHP_WIN32) && _MSC_VER < 1900 && defined(ZTS) { /* Even with the enabled per thread locale, localeconv won't check any locale change in the master thread. */ diff --git a/win32/signal.h b/win32/signal.h index df60dfb728..a131e6ef99 100644 --- a/win32/signal.h +++ b/win32/signal.h @@ -1,3 +1,6 @@ +#if _MSC_VER >= 1900 +#include <signal.h> +#else /* ** Change here: if you plan to use your own version of <signal.h> ** the original "#include <signal.h>" produces an infinite reinclusion @@ -11,6 +14,7 @@ ** include file is located. */ #include <../include/signal.h> +#endif #define SIGALRM 13 #define SIGVTALRM 26 /* virtual time alarm */ #define SIGPROF 27 /* profiling time alarm */ |