archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Resolve conflict

Browse source
This commit is contained in:
Sammy Kaye Powers 2017-01-03 08:01:05 -06:00
commit 1e3624290a
42 changed files with 20821 additions and 6764 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/php.h
View file

@ -176,6 +176,14 @@ END_EXTERN_C()
#define strlcat php_strlcat
#endif
#ifndef HAVE_EXPLICIT_BZERO
BEGIN_EXTERN_C()
PHPAPI void php_explicit_bzero(void *dst, size_t siz);
END_EXTERN_C()
#undef explicit_bzero
#define explicit_bzero php_explicit_bzero
#endif
#ifndef HAVE_STRTOK_R
BEGIN_EXTERN_C()
char *strtok_r(char *s, const char *delim, char **last);