com php-src: use php_socket_t instead of int: ext /standard/file.h main/network.c

Commit: 6445c4bd484239b92f8dd4439cab2bac87bc23c4 Author: Anatol Belski <ab@php.net> Thu, 9 Oct 2014 10:35:47 +0200 Parents: 6075e5a549dea536f022a6289ee75ecb7a54ce02 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6445c4bd484239b92f8dd4439cab2bac87bc23c4 Log: use php_socket_t instead of int Changed paths: M ext/standard/file.h M main/network.c Diff: diff --git a/ext/standard/file.h b/ext/standard/file.h index fdace75..ec60b86 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -23,6 +23,8 @@ #ifndef FILE_H #define FILE_H +#include "php_network.h" + PHP_MINIT_FUNCTION(file); PHP_MSHUTDOWN_FUNCTION(file); @@ -73,7 +75,7 @@ PHP_FUNCTION(sys_get_temp_dir); PHP_MINIT_FUNCTION(user_streams); PHPAPI int php_le_stream_context(TSRMLS_D); -PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC); +PHPAPI int php_set_sock_blocking(php_socket_t socketd, int block TSRMLS_DC); PHPAPI int php_copy_file(const char *src, const char *dest TSRMLS_DC); PHPAPI int php_copy_file_ex(const char *src, const char *dest, int src_chk TSRMLS_DC); PHPAPI int php_copy_file_ctx(const char *src, const char *dest, int src_chk, php_stream_context *ctx TSRMLS_DC); diff --git a/main/network.c b/main/network.c index bb21f0f..9fd1285 100644 --- a/main/network.c +++ b/main/network.c @@ -1123,7 +1123,7 @@ PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short p return stream; } -PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC) +PHPAPI int php_set_sock_blocking(php_socket_t socketd, int block TSRMLS_DC) { int ret = SUCCESS; int flags;