diff options
| author | Sammy Kaye Powers <sammyk@sammykmedia.com> | 2017-01-03 08:01:05 -0600 |
|---|---|---|
| committer | Sammy Kaye Powers <sammyk@sammykmedia.com> | 2017-01-03 08:01:05 -0600 |
| commit | 1e3624290ab30291765feca1502e8cf3aa773314 (patch) | |
| tree | 3969ef3a1cd4d8270d050b04b81143166d699224 /main/php.h | |
| parent | 9e29f841ce3711488781be958ffdfc42d738de4a (diff) | |
| parent | f0031ed15156e7a07983aba7a9a3155c3eb31252 (diff) | |
| download | php-git-1e3624290ab30291765feca1502e8cf3aa773314.tar.gz | |
Resolve conflict
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/php.h b/main/php.h index b640bfcecd..23d365d9e3 100644 --- a/main/php.h +++ b/main/php.h @@ -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); |