Fix typedef redefinition warnings.

Closes GH-7197.
php · Jun 28, 2021 · 6157fcc · 6157fcc
1 parent 0e932f7
commit 6157fcc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/Zend/zend.h b/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);

diff --git a/Zend/zend_fibers.h b/Zend/zend_fibers.h
@@ -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. */

diff --git a/ext/opcache/jit/zend_jit_gdb.c b/ext/opcache/jit/zend_jit_gdb.c
@@ -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) \