mirror of
https://github.com/php/php-src.git
synced 2024-11-26 19:33:55 +08:00
Zend: Remove dependency on zend.h for certain headers (#12166)
This commit is contained in:
parent
58b8393cce
commit
5c3a6eaec9
@ -24,7 +24,6 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include "../TSRM/TSRM.h"
|
||||
#include "zend.h"
|
||||
|
||||
#ifndef ZEND_MM_ALIGNMENT
|
||||
# error "ZEND_MM_ALIGNMENT was not defined during configure"
|
||||
|
@ -21,7 +21,7 @@
|
||||
#ifndef ZEND_AST_H
|
||||
#define ZEND_AST_H
|
||||
|
||||
#include "zend.h"
|
||||
#include "zend_types.h"
|
||||
|
||||
#ifndef ZEND_AST_SPEC
|
||||
# define ZEND_AST_SPEC 1
|
||||
|
@ -20,8 +20,10 @@
|
||||
#ifndef ZEND_COMPILE_H
|
||||
#define ZEND_COMPILE_H
|
||||
|
||||
#include "zend.h"
|
||||
#include "zend_ast.h"
|
||||
#include "zend_types.h"
|
||||
#include "zend_map_ptr.h"
|
||||
#include "zend_alloc.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdint.h>
|
||||
@ -85,7 +87,6 @@ typedef struct _znode { /* used only during compilation */
|
||||
} u;
|
||||
} znode;
|
||||
|
||||
/* Temporarily defined here, to avoid header ordering issues */
|
||||
typedef struct _zend_ast_znode {
|
||||
zend_ast_kind kind;
|
||||
zend_ast_attr attr;
|
||||
@ -492,6 +493,9 @@ struct _zend_op_array {
|
||||
#define ZEND_RETURN_VALUE 0
|
||||
#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 */
|
||||
typedef void (ZEND_FASTCALL *zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
|
||||
|
||||
|
@ -21,7 +21,9 @@
|
||||
#ifndef 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"
|
||||
|
||||
#define HASH_KEY_IS_STRING 1
|
||||
|
@ -20,8 +20,10 @@
|
||||
#ifndef ZEND_OBJECTS_API_H
|
||||
#define ZEND_OBJECTS_API_H
|
||||
|
||||
#include "zend.h"
|
||||
#include "zend_compile.h"
|
||||
#include "zend_types.h"
|
||||
#include "zend_gc.h"
|
||||
#include "zend_alloc.h"
|
||||
#include "zend_compile.h" /* For zend_property_info */
|
||||
|
||||
#define OBJ_BUCKET_INVALID (1<<0)
|
||||
|
||||
|
@ -19,7 +19,9 @@
|
||||
#ifndef 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()
|
||||
|
||||
|
@ -23,6 +23,7 @@
|
||||
|
||||
#include "zend_types.h"
|
||||
#include "zend_gc.h"
|
||||
#include "zend_hash.h"
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user