php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Zend: Remove dependency on zend.h for certain headers (#12166)

Browse Source
This commit is contained in:
George Peter Banyard
2023-09-11 12:27:21 +01:00
committed by GitHub
parent 58b8393cce
commit 5c3a6eaec9
7 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Zend/zend_alloc.h
View File

@@ -24,7 +24,6 @@
#include <stdio.h> #include <stdio.h>
#include "../TSRM/TSRM.h" #include "../TSRM/TSRM.h"
#include "zend.h"
#ifndef ZEND_MM_ALIGNMENT #ifndef ZEND_MM_ALIGNMENT
# error "ZEND_MM_ALIGNMENT was not defined during configure" # error "ZEND_MM_ALIGNMENT was not defined during configure"

2
Zend/zend_ast.h
View File

@@ -21,7 +21,7 @@
#ifndef ZEND_AST_H #ifndef ZEND_AST_H
#define ZEND_AST_H #define ZEND_AST_H
#include "zend.h" #include "zend_types.h"
#ifndef ZEND_AST_SPEC #ifndef ZEND_AST_SPEC
# define ZEND_AST_SPEC 1 # define ZEND_AST_SPEC 1

8
Zend/zend_compile.h
View File

@@ -20,8 +20,10 @@
#ifndef ZEND_COMPILE_H #ifndef ZEND_COMPILE_H
#define ZEND_COMPILE_H #define ZEND_COMPILE_H
#include "zend.h"
#include "zend_ast.h" #include "zend_ast.h"
#include "zend_types.h"
#include "zend_map_ptr.h"
#include "zend_alloc.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h> #include <stdint.h>
@@ -85,7 +87,6 @@ typedef struct _znode { /* used only during compilation */
} u; } u;
} znode; } znode;
/* Temporarily defined here, to avoid header ordering issues */
typedef struct _zend_ast_znode { typedef struct _zend_ast_znode {
zend_ast_kind kind; zend_ast_kind kind;
zend_ast_attr attr; zend_ast_attr attr;
@@ -492,6 +493,9 @@ struct _zend_op_array {
#define ZEND_RETURN_VALUE 0 #define ZEND_RETURN_VALUE 0
#define ZEND_RETURN_REFERENCE 1 #define ZEND_RETURN_REFERENCE 1
#define INTERNAL_FUNCTION_PARAMETERS zend_execute_data *execute_data, zval *return_value
#define INTERNAL_FUNCTION_PARAM_PASSTHRU execute_data, return_value
/* zend_internal_function_handler */ /* zend_internal_function_handler */
typedef void (ZEND_FASTCALL *zif_handler)(INTERNAL_FUNCTION_PARAMETERS); typedef void (ZEND_FASTCALL *zif_handler)(INTERNAL_FUNCTION_PARAMETERS);

4
Zend/zend_hash.h
View File

@@ -21,7 +21,9 @@
#ifndef ZEND_HASH_H #ifndef ZEND_HASH_H
#define ZEND_HASH_H #define ZEND_HASH_H
#include "zend.h" #include "zend_types.h"
#include "zend_gc.h"
#include "zend_string.h"
#include "zend_sort.h" #include "zend_sort.h"
#define HASH_KEY_IS_STRING 1 #define HASH_KEY_IS_STRING 1

6
Zend/zend_objects_API.h
View File

@@ -20,8 +20,10 @@
#ifndef ZEND_OBJECTS_API_H #ifndef ZEND_OBJECTS_API_H
#define ZEND_OBJECTS_API_H #define ZEND_OBJECTS_API_H
#include "zend.h" #include "zend_types.h"
#include "zend_compile.h" #include "zend_gc.h"
#include "zend_alloc.h"
#include "zend_compile.h" /* For zend_property_info */
#define OBJ_BUCKET_INVALID (1<<0) #define OBJ_BUCKET_INVALID (1<<0)

4
Zend/zend_string.h
View File

@@ -19,7 +19,9 @@
#ifndef ZEND_STRING_H #ifndef ZEND_STRING_H
#define ZEND_STRING_H #define ZEND_STRING_H
#include "zend.h" #include "zend_types.h"
#include "zend_gc.h"
#include "zend_alloc.h"
BEGIN_EXTERN_C() BEGIN_EXTERN_C()

1
Zend/zend_variables.h
View File

@@ -23,6 +23,7 @@
#include "zend_types.h" #include "zend_types.h"
#include "zend_gc.h" #include "zend_gc.h"
#include "zend_hash.h"
BEGIN_EXTERN_C() BEGIN_EXTERN_C()