From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 29 Apr 2020 08:43:35 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38ecfe02459969a60e86de6d670b7ab7fba7305a;p=php

Merge branch 'PHP-7.4'

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

38ecfe02459969a60e86de6d670b7ab7fba7305a
diff --cc build/php.m4
index c5ce380264,51fa37446a..4197955bf1
--- a/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