Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix typo
  Simplify functions checks in m4

Author: petk

Zend/Zend.m4

@@ -306,10 +306,8 @@ AC_ARG_ENABLE([zend-signals],
   [ZEND_SIGNALS=$enableval],
   [ZEND_SIGNALS=yes])
 
-AC_CHECK_FUNC(sigaction, [
-	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
-], [
-	ZEND_SIGNALS=no
+AC_CHECK_FUNCS([sigaction], [], [
+  ZEND_SIGNALS=no
 ])
 if test "$ZEND_SIGNALS" = "yes"; then
 	AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling])

ext/pcntl/config.m4

@@ -4,9 +4,9 @@ PHP_ARG_ENABLE([pcntl],
     [Enable pcntl support (CLI/CGI only)])])
 
 if test "$PHP_PCNTL" != "no"; then
-  AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ])
-  AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: waitpid() not supported by this platform) ])
-  AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ])
+  AC_CHECK_FUNCS([fork], [], [AC_MSG_ERROR([pcntl: fork() not supported by this platform])])
+  AC_CHECK_FUNCS([waitpid], [], [AC_MSG_ERROR([pcntl: waitpid() not supported by this platform])])
+  AC_CHECK_FUNCS([sigaction], [], [AC_MSG_ERROR([pcntl: sigaction() not supported by this platform])])
   AC_CHECK_FUNCS([getpriority setpriority wait3 wait4 sigwaitinfo sigtimedwait unshare])
 
   AC_MSG_CHECKING([for siginfo_t])

win32/build/config.w32.h.in

@@ -87,7 +87,7 @@
 #define HAVE_LIBM 1
 #undef HAVE_RINT
 #define SIZEOF_SHORT 2
-/* int and long are stll 32bit in 64bit compiles */
+/* int and long are still 32bit in 64bit compiles */
 #define SIZEOF_INT 4
 #define SIZEOF_LONG 4
 /* MSVC.6/NET don't allow 'long long' or know 'intmax_t' */