archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

64bit fixes

Browse source
This commit is contained in:
Wez Furlong 2003-03-15 13:29:56 +00:00
parent b66957c56a
commit 16e705a547
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/streams/cast.c
View file

@ -163,7 +163,7 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
if (castas == PHP_STREAM_AS_STDIO) {
if (stream->stdiocast) {
if (ret) {
*ret = stream->stdiocast;
*(FILE**)ret = stream->stdiocast;
}
goto exit_success;
}
@ -183,7 +183,7 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
if (ret == NULL)
goto exit_success;
*ret = fopencookie(stream, stream->mode, PHP_STREAM_COOKIE_FUNCTIONS);
*(FILE**)ret = fopencookie(stream, stream->mode, PHP_STREAM_COOKIE_FUNCTIONS);
if (*ret != NULL) {
off_t pos;
@ -226,7 +226,7 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
int retcode = php_stream_cast(newstream, castas | flags, ret, show_err);
if (retcode == SUCCESS)
rewind((FILE*)*ret);
rewind(*(FILE**)ret);
/* do some specialized cleanup */
if ((flags & PHP_STREAM_CAST_RELEASE)) {
@ -275,7 +275,7 @@ exit_success:
}
if (castas == PHP_STREAM_AS_STDIO && ret)
stream->stdiocast = *ret;
stream->stdiocast = *(FILE**)ret;
if (flags & PHP_STREAM_CAST_RELEASE) {
php_stream_free(stream, PHP_STREAM_FREE_CLOSE_CASTED);

4
main/streams/plain_wrapper.c
View file

@ -487,7 +487,7 @@ static int php_stdiop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC)
data->file = fdopen(data->fd, stream->mode);
}
*ret = data->file;
*(FILE**)ret = data->file;
data->fd = -1;
}
return SUCCESS;
@ -505,7 +505,7 @@ static int php_stdiop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC)
fflush(data->file);
}
if (ret) {
*ret = (void*)fd;
*(int*)ret = fd;
}
return SUCCESS;
default:

4
main/streams/xp_socket.c
View file

@ -267,7 +267,7 @@ static int php_sockop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC)
switch(castas) {
case PHP_STREAM_AS_STDIO:
if (ret) {
*ret = fdopen(sock->socket, stream->mode);
*(FILE**)ret = fdopen(sock->socket, stream->mode);
if (*ret)
return SUCCESS;
return FAILURE;
@ -276,7 +276,7 @@ static int php_sockop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC)
case PHP_STREAM_AS_FD:
case PHP_STREAM_AS_SOCKETD:
if (ret)
*ret = (void*)sock->socket;
*(int*)ret = sock->socket;
return SUCCESS;
default:
return FAILURE;