Skip to content

Commit f0f1724

Browse files
dstogovdstogov
authored
Remove unintended ZEND_EXT_API usage (#15602)
1 parent c4ae645 commit f0f1724

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎ext/opcache/jit/zend_jit.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ static bool zend_may_be_dynamic_property(zend_class_entry *ce, zend_string *memb
706706
# endif
707707
#endif
708708

709-
ZEND_EXT_API void zend_jit_status(zval *ret)
709+
void zend_jit_status(zval *ret)
710710
{
711711
zval stats;
712712
array_init(&stats);
@@ -3046,7 +3046,7 @@ static int zend_jit_setup_hot_counters(zend_op_array *op_array)
30463046

30473047
#include "jit/zend_jit_trace.c"
30483048

3049-
ZEND_EXT_API int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
3049+
int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
30503050
{
30513051
if (dasm_ptr == NULL) {
30523052
return FAILURE;
@@ -3123,7 +3123,7 @@ ZEND_EXT_API int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
31233123
return FAILURE;
31243124
}
31253125

3126-
ZEND_EXT_API int zend_jit_script(zend_script *script)
3126+
int zend_jit_script(zend_script *script)
31273127
{
31283128
void *checkpoint;
31293129
zend_call_graph call_graph;
@@ -3235,7 +3235,7 @@ ZEND_EXT_API int zend_jit_script(zend_script *script)
32353235
return FAILURE;
32363236
}
32373237

3238-
ZEND_EXT_API void zend_jit_unprotect(void)
3238+
void zend_jit_unprotect(void)
32393239
{
32403240
#ifdef HAVE_MPROTECT
32413241
if (!(JIT_G(debug) & (ZEND_JIT_DEBUG_GDB|ZEND_JIT_DEBUG_PERF_DUMP))) {
@@ -3270,7 +3270,7 @@ ZEND_EXT_API void zend_jit_unprotect(void)
32703270
#endif
32713271
}
32723272

3273-
ZEND_EXT_API void zend_jit_protect(void)
3273+
void zend_jit_protect(void)
32743274
{
32753275
#ifdef HAVE_MPROTECT
32763276
if (!(JIT_G(debug) & (ZEND_JIT_DEBUG_GDB|ZEND_JIT_DEBUG_PERF_DUMP))) {
@@ -3362,7 +3362,7 @@ static int zend_jit_parse_config_num(zend_long jit)
33623362
return SUCCESS;
33633363
}
33643364

3365-
ZEND_EXT_API int zend_jit_config(zend_string *jit, int stage)
3365+
int zend_jit_config(zend_string *jit, int stage)
33663366
{
33673367
if (stage != ZEND_INI_STAGE_STARTUP && !JIT_G(enabled)) {
33683368
if (stage == ZEND_INI_STAGE_RUNTIME) {
@@ -3418,7 +3418,7 @@ ZEND_EXT_API int zend_jit_config(zend_string *jit, int stage)
34183418
return FAILURE;
34193419
}
34203420

3421-
ZEND_EXT_API int zend_jit_debug_config(zend_long old_val, zend_long new_val, int stage)
3421+
int zend_jit_debug_config(zend_long old_val, zend_long new_val, int stage)
34223422
{
34233423
if (stage != ZEND_INI_STAGE_STARTUP) {
34243424
if (((old_val ^ new_val) & ZEND_JIT_DEBUG_PERSISTENT) != 0) {
@@ -3431,7 +3431,7 @@ ZEND_EXT_API int zend_jit_debug_config(zend_long old_val, zend_long new_val, int
34313431
return SUCCESS;
34323432
}
34333433

3434-
ZEND_EXT_API void zend_jit_init(void)
3434+
void zend_jit_init(void)
34353435
{
34363436
#ifdef ZTS
34373437
jit_globals_id = ts_allocate_id(&jit_globals_id, sizeof(zend_jit_globals), (ts_allocate_ctor) zend_jit_globals_ctor, (ts_allocate_dtor) zend_jit_globals_dtor);
@@ -3440,7 +3440,7 @@ ZEND_EXT_API void zend_jit_init(void)
34403440
#endif
34413441
}
34423442

3443-
ZEND_EXT_API int zend_jit_check_support(void)
3443+
int zend_jit_check_support(void)
34443444
{
34453445
int i;
34463446

@@ -3499,7 +3499,7 @@ ZEND_EXT_API int zend_jit_check_support(void)
34993499
return SUCCESS;
35003500
}
35013501

3502-
ZEND_EXT_API void zend_jit_startup(void *buf, size_t size, bool reattached)
3502+
void zend_jit_startup(void *buf, size_t size, bool reattached)
35033503
{
35043504
zend_jit_halt_op = zend_get_halt_op();
35053505
zend_jit_profile_counter_rid = zend_get_op_array_extension_handle(ACCELERATOR_PRODUCT_NAME);
@@ -3582,7 +3582,7 @@ ZEND_EXT_API void zend_jit_startup(void *buf, size_t size, bool reattached)
35823582
zend_jit_protect();
35833583
}
35843584

3585-
ZEND_EXT_API void zend_jit_shutdown(void)
3585+
void zend_jit_shutdown(void)
35863586
{
35873587
if (JIT_G(debug) & ZEND_JIT_DEBUG_SIZE && dasm_ptr != NULL) {
35883588
fprintf(stderr, "\nJIT memory usage: %td\n", (ptrdiff_t)((char*)*dasm_ptr - (char*)dasm_buf));
@@ -3606,7 +3606,7 @@ static void zend_jit_reset_counters(void)
36063606
}
36073607
}
36083608

3609-
ZEND_EXT_API void zend_jit_activate(void)
3609+
void zend_jit_activate(void)
36103610
{
36113611
zend_jit_profile_counter = 0;
36123612
if (JIT_G(on)) {
@@ -3619,7 +3619,7 @@ ZEND_EXT_API void zend_jit_activate(void)
36193619
}
36203620
}
36213621

3622-
ZEND_EXT_API void zend_jit_deactivate(void)
3622+
void zend_jit_deactivate(void)
36233623
{
36243624
if (zend_jit_profile_counter && !CG(unclean_shutdown)) {
36253625
zend_class_entry *ce;
@@ -3702,7 +3702,7 @@ static void zend_jit_restart_preloaded_script(zend_persistent_script *script)
37023702
} ZEND_HASH_FOREACH_END();
37033703
}
37043704

3705-
ZEND_EXT_API void zend_jit_restart(void)
3705+
void zend_jit_restart(void)
37063706
{
37073707
if (dasm_buf) {
37083708
zend_jit_unprotect();

‎ext/opcache/jit/zend_jit.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,20 @@ extern int jit_globals_id;
150150
extern zend_jit_globals jit_globals;
151151
#endif
152152

153-
ZEND_EXT_API int zend_jit_op_array(zend_op_array *op_array, zend_script *script);
154-
ZEND_EXT_API int zend_jit_script(zend_script *script);
155-
ZEND_EXT_API void zend_jit_unprotect(void);
156-
ZEND_EXT_API void zend_jit_protect(void);
157-
ZEND_EXT_API void zend_jit_init(void);
158-
ZEND_EXT_API int zend_jit_config(zend_string *jit_options, int stage);
159-
ZEND_EXT_API int zend_jit_debug_config(zend_long old_val, zend_long new_val, int stage);
160-
ZEND_EXT_API int zend_jit_check_support(void);
161-
ZEND_EXT_API void zend_jit_startup(void *jit_buffer, size_t size, bool reattached);
162-
ZEND_EXT_API void zend_jit_shutdown(void);
163-
ZEND_EXT_API void zend_jit_activate(void);
164-
ZEND_EXT_API void zend_jit_deactivate(void);
165-
ZEND_EXT_API void zend_jit_status(zval *ret);
166-
ZEND_EXT_API void zend_jit_restart(void);
153+
int zend_jit_op_array(zend_op_array *op_array, zend_script *script);
154+
int zend_jit_script(zend_script *script);
155+
void zend_jit_unprotect(void);
156+
void zend_jit_protect(void);
157+
void zend_jit_init(void);
158+
int zend_jit_config(zend_string *jit_options, int stage);
159+
int zend_jit_debug_config(zend_long old_val, zend_long new_val, int stage);
160+
int zend_jit_check_support(void);
161+
void zend_jit_startup(void *jit_buffer, size_t size, bool reattached);
162+
void zend_jit_shutdown(void);
163+
void zend_jit_activate(void);
164+
void zend_jit_deactivate(void);
165+
void zend_jit_status(zval *ret);
166+
void zend_jit_restart(void);
167167

168168
#define ZREG_LOAD (1<<0)
169169
#define ZREG_STORE (1<<1)

0 commit comments

Comments
 (0)