mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Fix typedef redefinition warnings.
Closes GH-7197.
This commit is contained in:
parent
0e932f7cea
commit
6157fcc010
15
Zend/zend.h
15
Zend/zend.h
@ -119,7 +119,13 @@ typedef struct _zend_class_dependency {
|
||||
} zend_class_dependency;
|
||||
|
||||
typedef struct _zend_inheritance_cache_entry zend_inheritance_cache_entry;
|
||||
typedef struct _zend_error_info zend_error_info;
|
||||
|
||||
typedef struct _zend_error_info {
|
||||
int type;
|
||||
uint32_t lineno;
|
||||
zend_string *filename;
|
||||
zend_string *message;
|
||||
} zend_error_info;
|
||||
|
||||
struct _zend_inheritance_cache_entry {
|
||||
zend_inheritance_cache_entry *next;
|
||||
@ -382,13 +388,6 @@ typedef struct {
|
||||
zend_class_entry *exception;
|
||||
} zend_error_handling;
|
||||
|
||||
typedef struct _zend_error_info {
|
||||
int type;
|
||||
uint32_t lineno;
|
||||
zend_string *filename;
|
||||
zend_string *message;
|
||||
} zend_error_info;
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
ZEND_API void zend_save_error_handling(zend_error_handling *current);
|
||||
ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, zend_class_entry *exception_class, zend_error_handling *current);
|
||||
|
@ -54,8 +54,6 @@ void zend_fiber_shutdown(void);
|
||||
|
||||
extern ZEND_API zend_class_entry *zend_ce_fiber;
|
||||
|
||||
typedef struct _zend_fiber zend_fiber;
|
||||
typedef struct _zend_fiber_context zend_fiber_context;
|
||||
typedef struct _zend_fiber_stack zend_fiber_stack;
|
||||
|
||||
/* Encapsulates data needed for a context switch. */
|
||||
|
@ -285,7 +285,6 @@ static void zend_gdbjit_symtab(zend_gdbjit_ctx *ctx)
|
||||
|
||||
typedef ZEND_SET_ALIGNED(1, uint16_t unaligned_uint16_t);
|
||||
typedef ZEND_SET_ALIGNED(1, uint32_t unaligned_uint32_t);
|
||||
typedef ZEND_SET_ALIGNED(1, uint16_t unaligned_uint16_t);
|
||||
typedef ZEND_SET_ALIGNED(1, uintptr_t unaligned_uintptr_t);
|
||||
|
||||
#define SECTALIGN(p, a) \
|
||||
|
Loading…
Reference in New Issue
Block a user