From 282700e60c7e123233273813d316657deb9e4381 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Wed, 2 May 2012 22:12:20 +0900 Subject: Fix that struct file_handle conflicts with glibc 2.14 Patch from Ubuntu to unbreak compilation with eglibc 2.14. (LP: #935540) --- istream.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'istream.c') diff --git a/istream.c b/istream.c index 8967280..d8c8e45 100644 --- a/istream.c +++ b/istream.c @@ -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); } -- cgit v1.2.3