current/SOURCES/w3m-0.5.3-file_handle.patch

diff -p -up w3m-0.5.3/istream.cfoo w3m-0.5.3/istream.c
--- w3m-0.5.3/istream.cfoo      2012-12-02 01:25:40.415296955 +0000
+++ w3m-0.5.3/istream.c 2012-12-02 01:28:00.408419876 +0000
@@ -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 file_foo *handle);
+static int file_read(struct file_foo *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 file_foo);
     stream->file.handle->f = f;
     if (closep)
        stream->file.handle->close = closep;
@@ -658,13 +658,13 @@ basic_read(int *handle, char *buf, int l
 }
 
 static void
-file_close(struct file_handle *handle)
+file_close(struct file_foo *handle)
 {
     handle->close(handle->f);
 }
 
 static int
-file_read(struct file_handle *handle, char *buf, int len)
+file_read(struct file_foo *handle, char *buf, int len)
 {
     return fread(buf, 1, len, handle->f);
 }
diff -p -up w3m-0.5.3/istream.hfoo w3m-0.5.3/istream.h
--- w3m-0.5.3/istream.hfoo      2003-10-20 16:41:56.000000000 +0000
+++ w3m-0.5.3/istream.h 2012-12-02 01:28:00.408419876 +0000
@@ -20,7 +20,7 @@ struct stream_buffer {
 
 typedef struct stream_buffer *StreamBuffer;
 
-struct file_handle {
+struct file_foo {
     FILE *f;
     void (*close) ();
 };
@@ -53,7 +53,7 @@ struct base_stream {
 
 struct file_stream {
     struct stream_buffer stream;
-    struct file_handle *handle;
+    struct file_foo *handle;
     char type;
     char iseos;
     int (*read) ();
1	diff -p -up w3m-0.5.3/istream.cfoo w3m-0.5.3/istream.c
2	--- w3m-0.5.3/istream.cfoo 2012-12-02 01:25:40.415296955 +0000
3	+++ w3m-0.5.3/istream.c 2012-12-02 01:28:00.408419876 +0000
4	@@ -22,8 +22,8 @@
5	static void basic_close(int *handle);
6	static int basic_read(int handle, char buf, int len);
7
8	-static void file_close(struct file_handle *handle);
9	-static int file_read(struct file_handle handle, char buf, int len);
10	+static void file_close(struct file_foo *handle);
11	+static int file_read(struct file_foo handle, char buf, int len);
12
13	static int str_read(Str handle, char *buf, int len);
14
15	@@ -114,7 +114,7 @@ newFileStream(FILE * f, void (*closep) (
16	stream = New(union input_stream);
17	init_base_stream(&stream->base, STREAM_BUF_SIZE);
18	stream->file.type = IST_FILE;
19	- stream->file.handle = New(struct file_handle);
20	+ stream->file.handle = New(struct file_foo);
21	stream->file.handle->f = f;
22	if (closep)
23	stream->file.handle->close = closep;
24	@@ -658,13 +658,13 @@ basic_read(int handle, char buf, int l
25	}
26
27	static void
28	-file_close(struct file_handle *handle)
29	+file_close(struct file_foo *handle)
30	{
31	handle->close(handle->f);
32	}
33
34	static int
35	-file_read(struct file_handle handle, char buf, int len)
36	+file_read(struct file_foo handle, char buf, int len)
37	{
38	return fread(buf, 1, len, handle->f);
39	}
40	diff -p -up w3m-0.5.3/istream.hfoo w3m-0.5.3/istream.h
41	--- w3m-0.5.3/istream.hfoo 2003-10-20 16:41:56.000000000 +0000
42	+++ w3m-0.5.3/istream.h 2012-12-02 01:28:00.408419876 +0000
43	@@ -20,7 +20,7 @@ struct stream_buffer {
44
45	typedef struct stream_buffer *StreamBuffer;
46
47	-struct file_handle {
48	+struct file_foo {
49	FILE *f;
50	void (*close) ();
51	};
52	@@ -53,7 +53,7 @@ struct base_stream {
53
54	struct file_stream {
55	struct stream_buffer stream;
56	- struct file_handle *handle;
57	+ struct file_foo *handle;
58	char type;
59	char iseos;
60	int (*read) ();