qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-12-22 13:56:48 +02:00
Code

fbterm now builds against both tiny and gnu iconv

Browse Source
This commit is contained in:
kyak 2011-01-10 17:02:24 +03:00
parent a05abc9cb9
commit 8de229d4ed
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fbterm/patches/001-iconv.patch Normal file
View File

@ -0,0 +1,36 @@
diff -ur fbterm-1.6.orig/src/lib/io.cpp fbterm-1.6/src/lib/io.cpp
--- fbterm-1.6.orig/src/lib/io.cpp 2011-01-10 13:13:05.158606303 +0300
+++ fbterm-1.6/src/lib/io.cpp 2011-01-10 14:06:58.512695530 +0300
@@ -119,10 +119,10 @@
if (!strcasecmp(up, down)) return;
mCodecRead = iconv_open(up, down);
- if (mCodecRead == (void*)-1) mCodecRead = 0;
+ if (mCodecRead == (iconv_t)(-1)) mCodecRead = 0;
mCodecWrite = iconv_open(down, up);
- if (mCodecWrite == (void*)-1) mCodecWrite = 0;
+ if (mCodecWrite == (iconv_t)(-1)) mCodecWrite = 0;
}
#define BUF_SIZE 10240
diff -ur fbterm-1.6.orig/src/lib/io.h fbterm-1.6/src/lib/io.h
--- fbterm-1.6.orig/src/lib/io.h 2011-01-10 13:13:05.158606303 +0300
+++ fbterm-1.6/src/lib/io.h 2011-01-10 14:08:33.247605712 +0300
@@ -23,6 +23,7 @@
#include "type.h"
#include "instance.h"
+#include <iconv.h>
class IoPipe {
public:
@@ -47,7 +48,7 @@
void writeIo(s8 *buf, u32 len);
s32 mFd;
- void *mCodecRead, *mCodecWrite;
+ iconv_t mCodecRead, mCodecWrite;
s8 mBufRead[16], mBufWrite[16];
u32 mBufLenRead, mBufLenWrite;
};