Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79532: sizeof off_t can be wrong

diff --cc build/php.m4
index c5ce3802646273c6518553ae2d5a8e2e323209d2,51fa37446a509759bbd4d63662d47bb7daf6ae59..4197955bf1a7c4b716d99e5e69ac652f0f411b0b
--- 1/build/php.m4
--- 2/build/php.m4
+++ b/build/php.m4
@@@ -2418,8 -2416,11 +2418,9 @@@ AC_DEFUN([PHP_CHECK_STDINT_TYPES], 
    AC_CHECK_SIZEOF([long])
    AC_CHECK_SIZEOF([long long])
    AC_CHECK_SIZEOF([size_t])
+   AC_CHECK_SIZEOF([off_t])
    AC_CHECK_TYPES([int8, int16, int32, int64, int8_t, int16_t, int32_t, int64_t, uint8, uint16, uint32, uint64, uint8_t, uint16_t, uint32_t, uint64_t, u_int8_t, u_int16_t, u_int32_t, u_int64_t], [], [], [
 -#if HAVE_STDINT_H
 -# include <stdint.h>
 -#endif
 +#include <stdint.h>
  #if HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif

diff --cc ext/pdo_pgsql/pdo_pgsql.c
Simple merge

diff --cc ext/pdo_pgsql/pgsql_driver.c
Simple merge

diff --cc ext/pgsql/php_pgsql.h
Simple merge

diff --cc ext/zend_test/php_test.h
Simple merge

diff --cc ext/zend_test/test.c
Simple merge

diff --cc win32/build/config.w32.h.in
Simple merge