aboutsummaryrefslogtreecommitdiffstats
path: root/istream.h
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@vega.ocn.ne.jp>2012-05-02 13:13:18 +0000
committerTatsuya Kinoshita <tats@vega.ocn.ne.jp>2012-05-02 13:13:18 +0000
commit0b3230f84b794310e4d69ac06d98fa011ba6788d (patch)
tree2759302ac99632ec0c19e72403576dc07678a146 /istream.h
parentMerge branch 'bug/646321' (diff)
parentFix that struct file_handle conflicts with glibc 2.14 (diff)
downloadw3m-0b3230f84b794310e4d69ac06d98fa011ba6788d.tar.gz
w3m-0b3230f84b794310e4d69ac06d98fa011ba6788d.zip
Merge branch 'bug/file_handle_glibc214'
Diffstat (limited to '')
-rw-r--r--istream.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/istream.h b/istream.h
index a220d8b..e710e78 100644
--- a/istream.h
+++ b/istream.h
@@ -20,7 +20,7 @@ struct stream_buffer {
typedef struct stream_buffer *StreamBuffer;
-struct file_handle {
+struct io_file_handle {
FILE *f;
void (*close) ();
};
@@ -53,7 +53,7 @@ struct base_stream {
struct file_stream {
struct stream_buffer stream;
- struct file_handle *handle;
+ struct io_file_handle *handle;
char type;
char iseos;
int (*read) ();