diff options
| author | Wez Furlong <wez@php.net> | 2003-02-28 21:03:36 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-02-28 21:03:36 +0000 |
| commit | 349ce76f9660850c0a15f660dff7cebb81c0abc8 (patch) | |
| tree | cd03704ec5665e40106e5c509e3fb313c4423c50 /ext/standard/streamsfuncs.c | |
| parent | 1ad304c2c529905c9a157afa8d3bb57f26481f7e (diff) | |
| download | php-git-349ce76f9660850c0a15f660dff7cebb81c0abc8.tar.gz | |
Tidy up stupid signed/unsigned issues with win32 by introducing a php_socket_t typedef.
Diffstat (limited to 'ext/standard/streamsfuncs.c')
| -rw-r--r-- | ext/standard/streamsfuncs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 110058ac26..4e46d7694a 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -28,10 +28,13 @@ #include "ext/standard/basic_functions.h" #include "php_ini.h" #include "streamsfuncs.h" - +#include "php_network.h" +#include "php_string.h" #ifndef PHP_WIN32 #define php_select(m, r, w, e, t) select(m, r, w, e, t) +#else +#include "win32/select.h" #endif static php_stream_context *decode_context_param(zval *contextresource TSRMLS_DC); @@ -342,11 +345,11 @@ PHP_FUNCTION(stream_get_wrappers) /* }}} */ /* {{{ stream_select related functions */ -static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, int *max_fd TSRMLS_DC) +static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t *max_fd TSRMLS_DC) { zval **elem; php_stream *stream; - int this_fd; + php_socket_t this_fd; if (Z_TYPE_P(stream_array) != IS_ARRAY) { return 0; |