diff options
| author | Andi Gutmans <andi@php.net> | 1999-08-25 13:46:52 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-08-25 13:46:52 +0000 |
| commit | c5d640d8af3b16cebbb756a6c39b19d3bf7d7676 (patch) | |
| tree | 4bccbdb0457b2c3c4eb2e9d76d9cd50a19ffa341 /Zend | |
| parent | f065529b6dd27d1573bde93f52727ebebc41444f (diff) | |
| download | php-git-c5d640d8af3b16cebbb756a6c39b19d3bf7d7676.tar.gz | |
- More elegant fix for Win32 include_path
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend-scanner.l | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l index 9f99b8cf08..6d32518077 100644 --- a/Zend/zend-scanner.l +++ b/Zend/zend-scanner.l @@ -51,6 +51,7 @@ #ifdef ZTS # include <fstream.h> +# include <stdiostr.h> # if WIN32||WINNT # include <strstrea.h> # else @@ -170,7 +171,7 @@ BEGIN_EXTERN_C() ZEND_API void zend_open_file_dtor(void *f) { #ifdef ZTS - delete *((ifstream **) f); + delete *((istream **) f); #else fclose(*((FILE **) f)); #endif @@ -219,35 +220,21 @@ ZEND_API inline int open_file_for_scanning(zend_file_handle *file_handle CLS_DC) break; case ZEND_HANDLE_FILENAME: { -#if (WIN32|WINNT) - int fd; file_handle->handle.fp = zend_fopen(file_handle->filename); if (!file_handle->handle.fp) { return FAILURE; } - fd = fileno(file_handle->handle.fp); - file_handle->handle.is = new istream(new filebuf(fd)); -#else - file_handle->handle.is = new ifstream(file_handle->filename, ios::nocreate|ios::in|ios::binary); -#endif + file_handle->handle.is = new stdiostream(file_handle->handle.fp); break; } case ZEND_HANDLE_FP: if (file_handle->handle.fp==stdin) { file_handle->handle.is = (ifstream *) &cin; } else { -#if (WIN32|WINNT) - int fd; - if (!file_handle->handle.fp) { return FAILURE; } - fd = fileno(file_handle->handle.fp); - file_handle->handle.is = new istream(new filebuf(fd)); -#else - fclose(file_handle->handle.fp); - file_handle->handle.is = new ifstream(file_handle->filename, ios::nocreate|ios::in|ios::binary); -#endif + file_handle->handle.is = new stdiostream(file_handle->handle.fp); } break; } |