@@ -279,21 +279,12 @@ static nr_status_t nr_strtoi(int* val_p, const char* str, int base) {
279
279
return NR_SUCCESS ;
280
280
}
281
281
282
- #ifdef PHP7
283
282
#define PHP_INI_ENTRY_NAME (ie ) (ie)->name->val
284
283
#define PHP_INI_ENTRY_NAME_LEN (ie ) (ie)->name->len + 1
285
284
#define PHP_INI_ENTRY_ORIG_VALUE (ie ) (ie)->orig_value->val
286
285
#define PHP_INI_ENTRY_ORIG_VALUE_LEN (ie ) (ie)->orig_value->len
287
286
#define PHP_INI_ENTRY_VALUE (ie ) (ie)->value->val
288
287
#define PHP_INI_ENTRY_VALUE_LEN (ie ) (ie)->value->len
289
- #else
290
- #define PHP_INI_ENTRY_NAME (ie ) (ie)->name
291
- #define PHP_INI_ENTRY_NAME_LEN (ie ) (ie)->name_length
292
- #define PHP_INI_ENTRY_ORIG_VALUE (ie ) (ie)->orig_value
293
- #define PHP_INI_ENTRY_ORIG_VALUE_LEN (ie ) (ie)->orig_value_length
294
- #define PHP_INI_ENTRY_VALUE (ie ) (ie)->value
295
- #define PHP_INI_ENTRY_VALUE_LEN (ie ) (ie)->value_length
296
- #endif
297
288
298
289
/*
299
290
* Next we declare some custom display functions for producing more neatly
@@ -417,13 +408,8 @@ static PHP_INI_DISP(nr_framework_dh) {
417
408
* Now begin the modify handlers. Firstly, we shall define some compatibility
418
409
* macros.
419
410
*/
420
- #ifdef PHP7
421
411
#define NEW_VALUE new_value->val
422
412
#define NEW_VALUE_LEN new_value->len
423
- #else
424
- #define NEW_VALUE new_value
425
- #define NEW_VALUE_LEN new_value_length
426
- #endif /* PHP7 */
427
413
428
414
/*
429
415
* On PHP 5, the arguments to the modify handlers are:
@@ -3527,7 +3513,6 @@ nrobj_t* nr_php_app_settings(void) {
3527
3513
}
3528
3514
3529
3515
int nr_php_ini_setting_is_set_by_user (const char * name ) {
3530
- #ifdef PHP7
3531
3516
int found ;
3532
3517
zend_string * zs ;
3533
3518
@@ -3540,24 +3525,4 @@ int nr_php_ini_setting_is_set_by_user(const char* name) {
3540
3525
zend_string_free (zs );
3541
3526
3542
3527
return found ;
3543
- #else
3544
- int zend_rv ;
3545
- uint name_length ;
3546
- zval default_value ;
3547
-
3548
- if (0 == name ) {
3549
- return 0 ;
3550
- }
3551
-
3552
- name_length = nr_strlen (name ) + 1 ;
3553
-
3554
- nr_memset (& default_value , 0 , sizeof (default_value ));
3555
-
3556
- zend_rv = zend_get_configuration_directive (name , name_length , & default_value );
3557
- if (SUCCESS == zend_rv ) {
3558
- return 1 ;
3559
- } else {
3560
- return 0 ;
3561
- }
3562
- #endif /* PHP7 */
3563
3528
}
0 commit comments