several fixes -

- param parsing Z_PARAM_STR vs Z_PARAM_STRING
- some functions for new params
- etc

1 files changed, 7 insertions, 7 deletions

diff --git a/ext/standard/php_smart_str.h b/ext/standard/php_smart_str.h
index 2c8c966540..f4913f7b99 100644
--- a/ext/standard/php_smart_str.h
+++ b/ext/standard/php_smart_str.h
@@ -130,15 +130,15 @@
  * #define f(..) ({char *r;..;__r;})
  */  
  
-static inline char *smart_str_print_long(char *buf, long num) {
+static inline char *smart_str_print_long(char *buf, zend_int_t num) {
 	char *r; 
-	_zend_print_signed_to_buf(buf, num, long, r); 
+	_zend_print_signed_to_buf(buf, num, zend_int_t, r); 
 	return r;
 }
 
-static inline char *smart_str_print_unsigned(char *buf, long num) {
+static inline char *smart_str_print_unsigned(char *buf, zend_int_t num) {
 	char *r; 
-	_zend_print_unsigned_to_buf(buf, num, unsigned long, r); 
+	_zend_print_unsigned_to_buf(buf, num, zend_uint_t, r); 
 	return r;
 }
 
@@ -150,13 +150,13 @@ static inline char *smart_str_print_unsigned(char *buf, long num) {
 } while (0)
 	
 #define smart_str_append_unsigned_ex(dest, num, type) \
-	smart_str_append_generic_ex((dest), (num), (type), unsigned long, _unsigned)
+	smart_str_append_generic_ex((dest), (num), (type), zend_uint_t, _unsigned)
 
 #define smart_str_append_int_ex(dest, num, type) \
-	smart_str_append_generic_ex((dest), (num), (type), unsigned long, _signed)
+	smart_str_append_generic_ex((dest), (num), (type), zend_uint_t, _signed)
 
 #define smart_str_append_off_t_ex(dest, num, type) \
-	smart_str_append_generic_ex((dest), (num), (type), off_t, _signed)
+	smart_str_append_generic_ex((dest), (num), (type), zend_off_t, _signed)
 
 #define smart_str_append_ex(dest, src, what) 						\
 	smart_str_appendl_ex((dest), ((smart_str *)(src))->s->val, 		\