merge gb branch back

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1379 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 7 insertions, 0 deletions

diff --git a/include/proto.h b/include/proto.h
index f551df57..63c146a2 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -277,7 +277,14 @@ int guess_main();
 int x_dict();
 int use_dict(char *dict,char *database);
 
+/* convert */
+unsigned char *gb2big(unsigned char *s, int plen);
+unsigned char *big2gb(unsigned char *s, int plen);
+
 /* io */
+int converting_write(int fd, void *buf, size_t count);
+int converting_read(int fd, void *buf, size_t count);
+void set_converting_type(int which);
 int getdata(int line, int col, char *prompt, char *buf, int len, int echo);
 int igetch();
 int getdata_str(int line, int col, char *prompt, char *buf, int len, int echo, char *defaultstr);