diff options
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 6875dd48d2..6df74c790c 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -36,27 +36,28 @@ #define MAX_LENGTH_OF_LONG 18 #define MAX_LENGTH_OF_DOUBLE 32 -ZEND_API int add_function(zval *result, zval *op1, zval *op2); -ZEND_API int sub_function(zval *result, zval *op1, zval *op2); -ZEND_API int mul_function(zval *result, zval *op1, zval *op2); -ZEND_API int div_function(zval *result, zval *op1, zval *op2); -ZEND_API int mod_function(zval *result, zval *op1, zval *op2); -ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2); -ZEND_API int boolean_not_function(zval *result, zval *op1); -ZEND_API int bitwise_not_function(zval *result, zval *op1); -ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2); -ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2); -ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2); -ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2); -ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2); -ZEND_API int concat_function(zval *result, zval *op1, zval *op2); - -ZEND_API int is_equal_function(zval *result, zval *op1, zval *op2); -ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2); -ZEND_API int is_not_identical_function(zval *result, zval *op1, zval *op2); -ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2); -ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2); -ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2); +ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int mod_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int boolean_not_function(zval *result, zval *op1 TSRMLS_DC); +ZEND_API int bitwise_not_function(zval *result, zval *op1 TSRMLS_DC); +ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); + +ZEND_API int is_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int is_not_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); + static inline int is_numeric_string(char *str, int length, long *lval, double *dval) { long local_lval; @@ -127,7 +128,7 @@ ZEND_API int increment_function(zval *op1); ZEND_API int decrement_function(zval *op2); BEGIN_EXTERN_C() -ZEND_API void convert_scalar_to_number(zval *op); +ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC); ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC); ZEND_API void convert_to_long(zval *op); ZEND_API void convert_to_double(zval *op); @@ -147,9 +148,9 @@ ZEND_API double zend_string_to_double(const char *number, zend_uint length); END_EXTERN_C() ZEND_API int zval_is_true(zval *op); -ZEND_API int compare_function(zval *result, zval *op1, zval *op2); -ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2); -ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2); +ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); ZEND_API void zend_str_tolower(char *str, unsigned int length); ZEND_API int zend_binary_zval_strcmp(zval *s1, zval *s2); @@ -162,9 +163,9 @@ ZEND_API int zend_binary_strcasecmp(char *s1, uint len1, char *s2, uint len2); ZEND_API int zend_binary_strncasecmp(char *s1, uint len1, char *s2, uint len2, uint length); ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2); -ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2); -ZEND_API void zend_compare_arrays(zval *result, zval *a1, zval *a2); -ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2); +ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2 TSRMLS_DC); +ZEND_API void zend_compare_arrays(zval *result, zval *a1, zval *a2 TSRMLS_DC); +ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2 TSRMLS_DC); ZEND_API int zend_atoi(const char *str, int str_len); @@ -205,7 +206,7 @@ ZEND_API int zend_atoi(const char *str, int str_len); if (!(*ppzv)->is_ref) { \ SEPARATE_ZVAL(ppzv); \ } \ - convert_scalar_to_number(*ppzv); \ + convert_scalar_to_number(*ppzv TSRMLS_CC); \ } |