--- embedaddon/php/Zend/zend_stream.c 2012/02/21 23:47:52 1.1.1.1 +++ embedaddon/php/Zend/zend_stream.c 2012/05/29 12:34:36 1.1.1.2 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_stream.c,v 1.1.1.1 2012/02/21 23:47:52 misho Exp $ */ +/* $Id: zend_stream.c,v 1.1.1.2 2012/05/29 12:34:36 misho Exp $ */ #include "zend.h" @@ -134,7 +134,7 @@ ZEND_API int zend_stream_open(const char *filename, ze handle->type = ZEND_HANDLE_FP; handle->opened_path = NULL; handle->handle.fp = zend_fopen(filename, &handle->opened_path TSRMLS_CC); - handle->filename = (char *)filename; + handle->filename = filename; handle->free_filename = 0; memset(&handle->handle.stream.mmap, 0, sizeof(zend_mmap)); @@ -284,7 +284,6 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_ if (ZEND_MMAP_AHEAD) { memset(file_handle->handle.stream.mmap.buf + file_handle->handle.stream.mmap.len, 0, ZEND_MMAP_AHEAD); } - #if HAVE_MMAP return_mapped: #endif @@ -328,7 +327,7 @@ ZEND_API void zend_file_handle_dtor(zend_file_handle * fh->opened_path = NULL; } if (fh->free_filename && fh->filename) { - efree(fh->filename); + efree((char*)fh->filename); fh->filename = NULL; } }