From 8de229d4ed04e27e248821e47f66310c37513e43 Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Mon, 10 Jan 2011 17:02:24 +0300
Subject: [PATCH] fbterm now builds against both tiny and gnu iconv

---
 fbterm/patches/001-iconv.patch | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 fbterm/patches/001-iconv.patch

diff --git a/fbterm/patches/001-iconv.patch b/fbterm/patches/001-iconv.patch
new file mode 100644
index 0000000..f530066
--- /dev/null
+++ b/fbterm/patches/001-iconv.patch
@@ -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;
+ };