com php-src: some datatype fixes: main/main.c main/php_global s.h main/php_main.h

Commit: b28101697237e30007017c4ff029e61b6337faf6 Author: Anatol Belski <ab@php.net> Wed, 29 Jan 2014 12:40:32 +0100 Parents: e2cab1d888a0c9ddfeebd03c94158d5ca5d0743b Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b28101697237e30007017c4ff029e61b6337faf6 Log: some datatype fixes Changed paths: M main/main.c M main/php_globals.h M main/php_main.h Diff: diff --git a/main/main.c b/main/main.c index e0aa72d..0141359 100644 --- a/main/main.c +++ b/main/main.c @@ -937,7 +937,7 @@ PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const #endif /* {{{ php_html_puts */ -PHPAPI void php_html_puts(const char *str, uint size TSRMLS_DC) +PHPAPI void php_html_puts(const char *str, php_size_t size TSRMLS_DC) { zend_html_puts(str, size TSRMLS_CC); } diff --git a/main/php_globals.h b/main/php_globals.h index afa9ef0..3c9b273 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -136,7 +136,7 @@ struct _php_core_globals { int last_error_type; char *last_error_message; char *last_error_file; - int last_error_lineno; + php_size_t last_error_lineno; char *disable_functions; char *disable_classes; diff --git a/main/php_main.h b/main/php_main.h index 1325486..a323d6e 100644 --- a/main/php_main..h +++ b/main/php_main.h @@ -47,7 +47,7 @@ PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC); PHPAPI void php_handle_aborted_connection(void); PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC); -PHPAPI void php_html_puts(const char *str, uint siz TSRMLS_DC); +PHPAPI void php_html_puts(const char *str, php_size_t siz TSRMLS_DC); PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle *handle, int mode TSRMLS_DC); extern void php_call_shutdown_functions(TSRMLS_D);