From: Remi Collet <remi@php.net>
Date: Mon, 4 Sep 2017 16:35:42 +0000 (+0200)
Subject: Fixed Bug #75149 redefinition of typedefs ttinfo and t1info
X-Git-Tag: php-7.2.0RC2~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1bf36778a9bd3081e47da8cb9e4f0461aa46d80;p=php

Fixed Bug #75149 redefinition of typedefs ttinfo and t1info

Minimal fix from upstream
Better name for struct will come later
---

diff --git a/ext/date/lib/timelib_private.h b/ext/date/lib/timelib_private.h
index cd402e0ac2..efc7c8029c 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