diff options
| author | Anatol Belski <ab@php.net> | 2014-10-05 19:26:17 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-05 19:26:17 +0200 |
| commit | a91d3580a7c9461729608c4b7e2c193cdf4206ce (patch) | |
| tree | 3a1b3b4dc105b1d46a9609a8b485c041304bd50c /TSRM | |
| parent | 11cf279196a7edba43080b3497fa04abe5a0e5f5 (diff) | |
| parent | d58b70622a7e99ceee074e420d9271c2d8de116c (diff) | |
| download | php-git-a91d3580a7c9461729608c4b7e2c193cdf4206ce.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
properly export tsrm_strtok_r()
Fixed list() behavior inconsistency (string handling is disabled for all cases, ArrayAccess objects handling is enabled for all cases, ZEND_FETCH_DIM_TMP_VAR opcode is renamed into ZEND_FETCH_LIST, ZEND_FETCH_ADD_LOCK flag is removed).
Fix accidental edit in previous commit
Fix arginfo
DateTimeZone::getOffset() now accepts a DateTimeInterface
DateTimeZone::getOffset() now accepts a DateTimeInterface
Moved checks and error reporting related to static methods from DO_FCALL inti INTI_FCALL* opcodes that may really deal with static methods. (In some rare cases it may lead to different order of warning messages).
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_strtok_r.c | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_strtok_r.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/TSRM/tsrm_strtok_r.c b/TSRM/tsrm_strtok_r.c index e9ad26a7ac..2522cf1d48 100644 --- a/TSRM/tsrm_strtok_r.c +++ b/TSRM/tsrm_strtok_r.c @@ -14,7 +14,7 @@ static inline int in_character_class(char ch, const char *delim) return 0; } -char *tsrm_strtok_r(char *s, const char *delim, char **last) +TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last) { char *token; diff --git a/TSRM/tsrm_strtok_r.h b/TSRM/tsrm_strtok_r.h index 8c9e8198e7..323b401d99 100644 --- a/TSRM/tsrm_strtok_r.h +++ b/TSRM/tsrm_strtok_r.h @@ -1,6 +1,8 @@ #ifndef TSRM_STRTOK_R #define TSRM_STRTOK_R -char *tsrm_strtok_r(char *s, const char *delim, char **last); +#include "TSRM.h" + +TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last); #endif |