mirror of
https://github.com/php/php-src.git
synced 2025-08-21 01:45:16 +02:00
Merge branch 'PHP-7.2'
* PHP-7.2: NEWS Fixed Bug #75149 redefinition of typedefs ttinfo and t1info
This commit is contained in:
commit
b662a7b691
1 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue