Merge branch 'PHP-7.2'

* 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

View file

@ -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