Skip to content

Commit 29d6b35

Browse files
ZNeumannlavarou
authored andcommitted
revert version change
1 parent 9d72ffd commit 29d6b35

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

agent/php_user_instrument.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ nruserfn_t* nr_php_add_custom_tracer_named(const char* namestr,
450450
size_t namestrlen) {
451451
nruserfn_t* wraprec;
452452
nruserfn_t* p;
453-
#if ZEND_MODULE_API_NO >= ZEND_8_3_X_API_NO
453+
#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
454454
zend_function* orig_func;
455455
zend_observer_fcall_begin_handler *begin_handler;
456456
#endif
@@ -483,7 +483,7 @@ nruserfn_t* nr_php_add_custom_tracer_named(const char* namestr,
483483
NRP_PHP(wraprec->classname),
484484
(0 == wraprec->classname) ? "" : "::", NRP_PHP(wraprec->funcname));
485485

486-
#if ZEND_MODULE_API_NO >= ZEND_8_3_X_API_NO
486+
#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
487487
orig_func = nr_php_wrap_user_function_internal(wraprec TSRMLS_CC);
488488
#else
489489
nr_php_wrap_user_function_internal(wraprec TSRMLS_CC);
@@ -493,7 +493,7 @@ nruserfn_t* nr_php_add_custom_tracer_named(const char* namestr,
493493
* non-transients to be freed when the linked list is disposed of which is at
494494
* module shutdown */
495495
nr_php_add_custom_tracer_common(wraprec);
496-
#if ZEND_MODULE_API_NO >= ZEND_8_3_X_API_NO
496+
#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
497497
if (orig_func) {
498498
// Before messing with our handlers, we must ensure that the observer fields of the function are initialized
499499
begin_handler = (zend_observer_fcall_begin_handler *)&ZEND_OP_ARRAY_EXTENSION((&(orig_func)->common), zend_observer_fcall_op_array_extension);

agent/php_wrapper.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ nruserfn_t* nr_php_wrap_callable_before_after(
8484
nrspecialfn_t before_callback,
8585
nrspecialfn_t after_callback) {
8686
char* name = NULL;
87-
#if ZEND_MODULE_API_NO >= ZEND_8_3_X_API_NO
87+
#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
8888
zend_observer_fcall_begin_handler *begin_handler;
8989
#endif
9090

@@ -103,7 +103,7 @@ nruserfn_t* nr_php_wrap_callable_before_after(
103103
if (nrl_should_print(NRL_VERBOSEDEBUG, NRL_INSTRUMENT) && NULL != name) {
104104
nr_free(name);
105105
}
106-
#if ZEND_MODULE_API_NO >= ZEND_8_3_X_API_NO
106+
#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
107107
if (callable) {
108108
// Before messing with our handlers, we must ensure that the observer fields of the function are initialized
109109
begin_handler = (zend_observer_fcall_begin_handler *)&ZEND_OP_ARRAY_EXTENSION((&(callable)->common), zend_observer_fcall_op_array_extension);
@@ -172,7 +172,7 @@ nruserfn_t* nr_php_wrap_callable(zend_function* callable,
172172
nrspecialfn_t callback TSRMLS_DC) {
173173
/* creates a transient wraprec */
174174
nruserfn_t* wraprec = nr_php_add_custom_tracer_callable(callable TSRMLS_CC);
175-
#if ZEND_MODULE_API_NO >= ZEND_8_3_X_API_NO
175+
#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
176176
zend_observer_fcall_begin_handler *begin_handler;
177177
#endif
178178

@@ -185,7 +185,7 @@ nruserfn_t* nr_php_wrap_callable(zend_function* callable,
185185
__func__);
186186
} else {
187187
wraprec->special_instrumentation = callback;
188-
#if ZEND_MODULE_API_NO >= ZEND_8_3_X_API_NO
188+
#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
189189
if (callable) {
190190
// Before messing with our handlers, we must ensure that the observer fields of the function are initialized
191191
begin_handler = (zend_observer_fcall_begin_handler *)&ZEND_OP_ARRAY_EXTENSION((&(callable)->common), zend_observer_fcall_op_array_extension);

0 commit comments

Comments
 (0)