Skip to content

Commit 1f4b733

Browse files
author
Ion Bazan
committed
optimized timecop.h
1 parent a90ad3f commit 1f4b733

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

timecop.h

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,6 @@ static int timecop_class_override_clear(TSRMLS_D);
197197
static int update_request_time(zend_long unixtime TSRMLS_DC);
198198
static int restore_request_time(TSRMLS_D);
199199

200-
#if PHP_MAJOR_VERSION >= 7
201-
static int fill_mktime_params(zval *fill_params, const char *date_function_name, int from);
202-
static int get_formatted_mock_time(zval *time, zval *timezone_obj, zval *retval_time, zval *retval_timezone);
203-
#else
204-
static int fill_mktime_params(zval ***params, const char *date_function_name, int from TSRMLS_DC);
205-
static int get_formatted_mock_time(zval *time, zval *timezone_obj, zval **retval_time, zval **retval_timezone TSRMLS_DC);
206-
#endif
207-
208200
static long get_mock_fraction(zval *time, zval *timezone_obj TSRMLS_DC);
209201

210202
static void _timecop_call_function(INTERNAL_FUNCTION_PARAMETERS, const char *function_name, int index_to_fill_timestamp);
@@ -223,21 +215,25 @@ static inline void _timecop_datetime_constructor(INTERNAL_FUNCTION_PARAMETERS, i
223215
static void _timecop_datetime_constructor_ex(INTERNAL_FUNCTION_PARAMETERS, zval *obj, int immutable);
224216

225217
#if PHP_MAJOR_VERSION >= 7
218+
static int fill_mktime_params(zval *fill_params, const char *date_function_name, int from);
219+
static int get_formatted_mock_time(zval *time, zval *timezone_obj, zval *retval_time, zval *retval_timezone);
220+
226221
static inline zval* _call_php_method(zval *object_pp, zend_class_entry *obj_ce, const char *method_name, zval *retval_ptr, zval* arg1, zval* arg2);
227222
static inline void _call_php_function(const char *function_name, zval *retval_ptr, zval* arg1, zval* arg2);
228223
static void _call_php_function_with_3_params(const char *function_name, zval *retval_ptr, zval *arg1, zval *arg2, zval *arg3);
229224
static inline void _call_php_function_with_params(const char *function_name, zval *retval_ptr, uint32_t param_count, zval params[]);
225+
226+
#define register_internal_class_ex(class_entry, parent_ce) \
227+
zend_register_internal_class_ex(class_entry, parent_ce)
230228
#else
229+
static int fill_mktime_params(zval ***params, const char *date_function_name, int from TSRMLS_DC);
230+
static int get_formatted_mock_time(zval *time, zval *timezone_obj, zval **retval_time, zval **retval_timezone TSRMLS_DC);
231+
231232
static inline zval* _call_php_function(const char *method_name, zval **retval_ptr_ptr, zval* arg1, zval* arg2 TSRMLS_DC);
232233
static inline zval* _call_php_method(zval **object_pp, zend_class_entry *obj_ce, const char *method_name, zval **retval_ptr_ptr, zval* arg1, zval* arg2 TSRMLS_DC);
233234
static void _call_php_function_with_3_params(const char *function_name, zval **retval_ptr_ptr, zval *arg1, zval *arg2, zval *arg3 TSRMLS_DC);
234235
static inline void _call_php_function_with_params(const char *function_name, zval **retval_ptr_ptr, zend_uint param_count, zval **params[] TSRMLS_DC);
235-
#endif
236236

237-
#if PHP_MAJOR_VERSION >= 7
238-
#define register_internal_class_ex(class_entry, parent_ce) \
239-
zend_register_internal_class_ex(class_entry, parent_ce)
240-
#else
241237
#define register_internal_class_ex(class_entry, parent_ce) \
242238
zend_register_internal_class_ex(class_entry, parent_ce, NULL TSRMLS_CC)
243239
#endif

0 commit comments

Comments
 (0)