1*4882a593SmuzhiyunFix building against libiconv 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunDownloaded from 4*4882a593Smuzhiyunhttps://github.com/kyak/openwrt-packages/blob/master/fbterm/patches/001-iconv.patch 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 7*4882a593Smuzhiyun 8*4882a593Smuzhiyun--- a/src/lib/io.cpp 9*4882a593Smuzhiyun+++ b/src/lib/io.cpp 10*4882a593Smuzhiyun@@ -119,10 +119,10 @@ void IoPipe::setCodec(const s8 *up, cons 11*4882a593Smuzhiyun if (!strcasecmp(up, down)) return; 12*4882a593Smuzhiyun 13*4882a593Smuzhiyun mCodecRead = iconv_open(up, down); 14*4882a593Smuzhiyun- if (mCodecRead == (void*)-1) mCodecRead = 0; 15*4882a593Smuzhiyun+ if (mCodecRead == (iconv_t)(-1)) mCodecRead = 0; 16*4882a593Smuzhiyun 17*4882a593Smuzhiyun mCodecWrite = iconv_open(down, up); 18*4882a593Smuzhiyun- if (mCodecWrite == (void*)-1) mCodecWrite = 0; 19*4882a593Smuzhiyun+ if (mCodecWrite == (iconv_t)(-1)) mCodecWrite = 0; 20*4882a593Smuzhiyun } 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun #define BUF_SIZE 10240 23*4882a593Smuzhiyun--- a/src/lib/io.h 24*4882a593Smuzhiyun+++ b/src/lib/io.h 25*4882a593Smuzhiyun@@ -23,6 +23,7 @@ 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun #include "type.h" 28*4882a593Smuzhiyun #include "instance.h" 29*4882a593Smuzhiyun+#include <iconv.h> 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun class IoPipe { 32*4882a593Smuzhiyun public: 33*4882a593Smuzhiyun@@ -47,7 +48,7 @@ private: 34*4882a593Smuzhiyun void writeIo(s8 *buf, u32 len); 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun s32 mFd; 37*4882a593Smuzhiyun- void *mCodecRead, *mCodecWrite; 38*4882a593Smuzhiyun+ iconv_t mCodecRead, mCodecWrite; 39*4882a593Smuzhiyun s8 mBufRead[16], mBufWrite[16]; 40*4882a593Smuzhiyun u32 mBufLenRead, mBufLenWrite; 41*4882a593Smuzhiyun }; 42