From 40fafbfba1a53581e9318c71d6366a24470173be Mon Sep 17 00:00:00 2001
From: victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Thu, 9 Sep 2004 04:42:53 +0000
Subject: fix chc bug, but still buggy

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2184 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 include/chc.h    | 7 +++++++
 include/common.h | 7 -------
 include/config.h | 5 +++--
 include/proto.h  | 1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/chc.h b/include/chc.h
index 9305ab0d..416f1193 100644
--- a/include/chc.h
+++ b/include/chc.h
@@ -19,6 +19,13 @@
 #define CHC_PERSONAL		4	/* ���� */
 #define CHC_WATCH_PERSONAL	8	/* �[�H���� */
 
+#define CHE_O(c)          ((c) >> 3)
+#define CHE_P(c)          ((c) & 7)
+#define RTL(x)            (((x) - 3) >> 1)
+#define dim(x)          (sizeof(x) / sizeof(x[0]))
+#define LTR(x)            ((x) * 2 + 3)
+#define CHE(a, b)         ((a) | ((b) << 3))
+
 #define BLACK_COLOR       "\033[1;36m"
 #define RED_COLOR         "\033[1;31m"
 #define BLACK_REVERSE     "\033[1;37;46m"
diff --git a/include/common.h b/include/common.h
index c830454a..04a351dd 100644
--- a/include/common.h
+++ b/include/common.h
@@ -178,13 +178,6 @@
 #define I_TIMEOUT   (-2)       /* Used for the getchar routine select call */
 #define I_OTHERDATA (-333)     /* interface, (-3) will conflict with chinese */
 
-#define CHE_O(c)          ((c) >> 3)
-#define CHE_P(c)          ((c) & 7)
-#define RTL(x)            (((x) - 3) >> 1)
-#define dim(x)          (sizeof(x) / sizeof(x[0]))
-#define LTR(x)            ((x) * 2 + 3)
-#define CHE(a, b)         ((a) | ((b) << 3))
-
 #define MAX_MODES 127
 
 #ifndef MIN
diff --git a/include/config.h b/include/config.h
index 3b75d63b..7b05978c 100644
--- a/include/config.h
+++ b/include/config.h
@@ -117,6 +117,9 @@
 #define ADD_EXMAILBOX     0              /* �ذe�H�c */
 #endif
 
+/* more.c ���峹���ƤW��(lines/22), +4 for safe */
+#define MAX_PAGES         (MAX_EDIT_LINE / 22 + 4)
+
 /* �H�U�٥���z */
 #define MAX_FRIEND        (256)          /* ���J cache ���̦h�B�ͼƥ� */
 #define MAX_REJECT        (32)           /* ���J cache ���̦h�a�H�ƥ� */
@@ -130,7 +133,6 @@
 #define MAX_LOGIN_INFO    (128)          /* �̦h�W�u�q���H�� */
 #define MAX_POST_INFO     (32)           /* �̦h�s�峹�q���H�� */
 #define MAX_NAMELIST      (128)          /* �̦h��L�S�O�W��H�� */
-#define MAX_PAGES         (999)          /* more.c ���峹���ƤW��(lines/22) */
 #define MAX_KEEPMAIL      (200)          /* �̦h�O�d�X�� MAIL�H */
 #define MAX_NOTE          (20)           /* �̦h�O�d�X�g�d���H */
 #define MAX_SIGLINES      (6)            /* ñ�W�ɤޤJ�̤j��� */
@@ -141,7 +143,6 @@
 #define LOGINATTEMPTS     (3)            /* �̤j�i�����~���� */
 #define WHERE                            /* �O�_���G�m�\�� */
 #undef  LOG_BOARD  			 /* �ݪO�O�_log */
-#undef SUPPORT_GB      			 /* �O�_�䴩gb */
 
 
 #define LOGINASNEW              /* �ĥΤW���ӽбb����� */
diff --git a/include/proto.h b/include/proto.h
index 0d66649f..f86e0a24 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -330,6 +330,7 @@ void add_distinct(char *fname, char *line);
 void u_exit(char *mode);
 void talk_request(int sig);
 int reply_connection_request(userinfo_t *uip);
+int establish_talk_connection(userinfo_t *uip);
 void my_talk(userinfo_t * uin, int fri_stat, char defact);
 
 /* menu */
-- 
cgit v1.2.3