OpenWrt packages
Sign in or create your account | Project List | Help
OpenWrt packages Git Source Tree
Root/
1 | diff -ur fbterm-1.6.orig/src/lib/io.cpp fbterm-1.6/src/lib/io.cpp |
2 | --- fbterm-1.6.orig/src/lib/io.cpp 2011-01-10 13:13:05.158606303 +0300 |
3 | +++ fbterm-1.6/src/lib/io.cpp 2011-01-10 14:06:58.512695530 +0300 |
4 | @@ -119,10 +119,10 @@ |
5 | if (!strcasecmp(up, down)) return; |
6 | |
7 | mCodecRead = iconv_open(up, down); |
8 | - if (mCodecRead == (void*)-1) mCodecRead = 0; |
9 | + if (mCodecRead == (iconv_t)(-1)) mCodecRead = 0; |
10 | |
11 | mCodecWrite = iconv_open(down, up); |
12 | - if (mCodecWrite == (void*)-1) mCodecWrite = 0; |
13 | + if (mCodecWrite == (iconv_t)(-1)) mCodecWrite = 0; |
14 | } |
15 | |
16 | #define BUF_SIZE 10240 |
17 | diff -ur fbterm-1.6.orig/src/lib/io.h fbterm-1.6/src/lib/io.h |
18 | --- fbterm-1.6.orig/src/lib/io.h 2011-01-10 13:13:05.158606303 +0300 |
19 | +++ fbterm-1.6/src/lib/io.h 2011-01-10 14:08:33.247605712 +0300 |
20 | @@ -23,6 +23,7 @@ |
21 | |
22 | #include "type.h" |
23 | #include "instance.h" |
24 | +#include <iconv.h> |
25 | |
26 | class IoPipe { |
27 | public: |
28 | @@ -47,7 +48,7 @@ |
29 | void writeIo(s8 *buf, u32 len); |
30 | |
31 | s32 mFd; |
32 | - void *mCodecRead, *mCodecWrite; |
33 | + iconv_t mCodecRead, mCodecWrite; |
34 | s8 mBufRead[16], mBufWrite[16]; |
35 | u32 mBufLenRead, mBufLenWrite; |
36 | }; |
37 |