diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-03-01 19:24:06 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-01 19:24:06 +0100 |
| commit | ac6b9b0b7feaa668b83db34860a3d373f5c98a34 (patch) | |
| tree | d96210b540475e4c64fed94fe60e0e5f38690a2b /main/php.h | |
| parent | 472f577679fe589bf73e2fa40444dc53928457f0 (diff) | |
| parent | a700451706b1a6da75f08a6a7e331635e17a6e99 (diff) | |
| download | php-git-ac6b9b0b7feaa668b83db34860a3d373f5c98a34.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove obsolescent AC_HEADER_STDC and memcpy check
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/main/php.h b/main/php.h index 332005fa4c..d0e3d566d5 100644 --- a/main/php.h +++ b/main/php.h @@ -230,17 +230,7 @@ typedef unsigned int socklen_t; #include "zend_hash.h" #include "zend_alloc.h" #include "zend_stack.h" - -#if STDC_HEADERS -# include <string.h> -#else -# ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy((s), (d), (n)) -# endif -# ifndef HAVE_MEMMOVE -# define memmove(d, s, n) bcopy ((s), (d), (n)) -# endif -#endif +#include <string.h> #ifndef HAVE_STRERROR char *strerror(int); |