archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.2'

Browse source 
* PHP-7.2:
  NEWS
  Fixed Bug #75149 redefinition of typedefs ttinfo and t1info
This commit is contained in:
Remi Collet 2017-09-04 18:38:01 +02:00
commit b662a7b691
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/date/lib/timelib_private.h
View file

@ -115,7 +115,7 @@
m = NULL; \ m = NULL; \
} }
typedef struct ttinfo struct ttinfo
{ {
int32_t offset; int32_t offset;
int isdst; int isdst;
@ -123,13 +123,13 @@ typedef struct ttinfo
unsigned int isstdcnt; unsigned int isstdcnt;
unsigned int isgmtcnt; unsigned int isgmtcnt;
} ttinfo; };
typedef struct tlinfo struct tlinfo
{ {
int32_t trans; int32_t trans;
int32_t offset; int32_t offset;
} tlinfo; };
#ifndef LONG_MAX #ifndef LONG_MAX