summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2014-02-18 15:47:34 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2014-02-18 15:47:34 +0800
commit69964cc1a70368b8c8e3700d824a9844a7716cad (patch)
treebc89a3c67c2e8ddb873c424754a4507c4e13c08a
parente159859b79ae37aeba10f1dc512285dcfe65f42a (diff)
downloadpttbbs-69964cc1a70368b8c8e3700d824a9844a7716cad.tar
pttbbs-69964cc1a70368b8c8e3700d824a9844a7716cad.tar.gz
pttbbs-69964cc1a70368b8c8e3700d824a9844a7716cad.tar.bz2
pttbbs-69964cc1a70368b8c8e3700d824a9844a7716cad.tar.lz
pttbbs-69964cc1a70368b8c8e3700d824a9844a7716cad.tar.xz
pttbbs-69964cc1a70368b8c8e3700d824a9844a7716cad.tar.zst
pttbbs-69964cc1a70368b8c8e3700d824a9844a7716cad.zip
Prevent conditional mappings in mail hotkeys.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5931 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--pttbbs/mbbsd/mail.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/pttbbs/mbbsd/mail.c b/pttbbs/mbbsd/mail.c
index 53521bc9..d02bb0eb 100644
--- a/pttbbs/mbbsd/mail.c
+++ b/pttbbs/mbbsd/mail.c
@@ -2128,11 +2128,11 @@ m_read(void)
////////////////////////////////////////////////////////////////////////
// Optional Features
-#ifdef OUTJOBSPOOL
static int
mail_waterball(int ent GCC_UNUSED, fileheader_t * fhdr,
const char *direct GCC_UNUSED)
{
+#ifdef OUTJOBSPOOL
static char address[60] = "", cmode = 1;
char fname[500], genbuf[200];
FILE *fp;
@@ -2211,8 +2211,10 @@ mail_waterball(int ent GCC_UNUSED, fileheader_t * fhdr,
fclose(fp);
vmsg("設定完成, 系統將在下一個整點(尖峰時段除外)將資料寄給您");
return FULLUPDATE;
-}
+#else
+ return DONOTHING;
#endif
+}
#ifdef USE_TIME_CAPSULE
static int
@@ -2318,11 +2320,7 @@ static const onekey_t mail_comms[] = {
{ 1, mail_read }, // 'r'
{ 1, mail_save }, // 's'
{ 0, NULL }, // 't'
-#ifdef OUTJOBSPOOL
{ 1, mail_waterball }, // 'u'
-#else
- { 0, NULL }, // 'u'
-#endif
{ 0, mail_read_all }, // 'v'
{ 1, b_call_in }, // 'w'
{ 1, m_forward }, // 'x'