diff options
author | Tatsuya Kinoshita <tats@vega.ocn.ne.jp> | 2012-05-02 13:13:18 +0000 |
---|---|---|
committer | Tatsuya Kinoshita <tats@vega.ocn.ne.jp> | 2012-05-02 13:13:18 +0000 |
commit | 0b3230f84b794310e4d69ac06d98fa011ba6788d (patch) | |
tree | 2759302ac99632ec0c19e72403576dc07678a146 /istream.c | |
parent | Merge branch 'bug/646321' (diff) | |
parent | Fix that struct file_handle conflicts with glibc 2.14 (diff) | |
download | w3m-0b3230f84b794310e4d69ac06d98fa011ba6788d.tar.gz w3m-0b3230f84b794310e4d69ac06d98fa011ba6788d.zip |
Merge branch 'bug/file_handle_glibc214'
Diffstat (limited to 'istream.c')
-rw-r--r-- | istream.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -22,8 +22,8 @@ static void basic_close(int *handle); static int basic_read(int *handle, char *buf, int len); -static void file_close(struct file_handle *handle); -static int file_read(struct file_handle *handle, char *buf, int len); +static void file_close(struct io_file_handle *handle); +static int file_read(struct io_file_handle *handle, char *buf, int len); static int str_read(Str handle, char *buf, int len); @@ -114,7 +114,7 @@ newFileStream(FILE * f, void (*closep) ()) stream = New(union input_stream); init_base_stream(&stream->base, STREAM_BUF_SIZE); stream->file.type = IST_FILE; - stream->file.handle = New(struct file_handle); + stream->file.handle = New(struct io_file_handle); stream->file.handle->f = f; if (closep) stream->file.handle->close = closep; @@ -658,13 +658,13 @@ basic_read(int *handle, char *buf, int len) } static void -file_close(struct file_handle *handle) +file_close(struct io_file_handle *handle) { handle->close(handle->f); } static int -file_read(struct file_handle *handle, char *buf, int len) +file_read(struct io_file_handle *handle, char *buf, int len) { return fread(buf, 1, len, handle->f); } |