From a1bf36778a9bd3081e47da8cb9e4f0461aa46d80 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Sep 2017 18:35:42 +0200 Subject: [PATCH 1/2] Fixed Bug #75149 redefinition of typedefs ttinfo and t1info Minimal fix from upstream Better name for struct will come later --- ext/date/lib/timelib_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/date/lib/timelib_private.h b/ext/date/lib/timelib_private.h index cd402e0ac21..efc7c8029c0 100644 --- a/ext/date/lib/timelib_private.h +++ b/ext/date/lib/timelib_private.h @@ -115,7 +115,7 @@ m = NULL; \ } -typedef struct ttinfo +struct ttinfo { int32_t offset; int isdst; @@ -123,13 +123,13 @@ typedef struct ttinfo unsigned int isstdcnt; unsigned int isgmtcnt; -} ttinfo; +}; -typedef struct tlinfo +struct tlinfo { int32_t trans; int32_t offset; -} tlinfo; +}; #ifndef LONG_MAX From 6355e650f7e523f704c95741efed3f0f051668d2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Sep 2017 18:37:45 +0200 Subject: [PATCH 2/2] NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 4fcd94ff202..12d4cd9edfd 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.2.0RC2 +- Date: + . Fixed bug #75149 (redefinition of typedefs ttinfo and t1info). (Remi) + - GD: . Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?). (cmb)