Merge branch 'PHP-7.1'

This commit is contained in:
Nikita Popov 2017-02-08 01:00:52 +01:00
commit 33adee5391

View File

@ -237,11 +237,13 @@ char *alloca();
# define ZEND_FASTCALL
#endif
#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004
#else
# define __restrict__
#ifndef restrict
# if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004
# else
# define __restrict__
# endif
# define restrict __restrict__
#endif
#define restrict __restrict__
#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)) || __has_attribute(noreturn)
# define HAVE_NORETURN