summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-02-14 18:26:47 +0800
committerin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-02-14 18:26:47 +0800
commit2660fe079e7c67fbcde31e206ec7ebe401aca136 (patch)
tree7a95185836ec9ea09f98277726ff9d219c07a642
parent162a59f51f60fa7fc589ef2f75625fad7f024dea (diff)
downloadpttbbs-2660fe079e7c67fbcde31e206ec7ebe401aca136.tar
pttbbs-2660fe079e7c67fbcde31e206ec7ebe401aca136.tar.gz
pttbbs-2660fe079e7c67fbcde31e206ec7ebe401aca136.tar.bz2
pttbbs-2660fe079e7c67fbcde31e206ec7ebe401aca136.tar.lz
pttbbs-2660fe079e7c67fbcde31e206ec7ebe401aca136.tar.xz
pttbbs-2660fe079e7c67fbcde31e206ec7ebe401aca136.tar.zst
pttbbs-2660fe079e7c67fbcde31e206ec7ebe401aca136.zip
fix conflict MAX_LINE
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1540 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--util/account.c6
-rw-r--r--util/yearsold.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/util/account.c b/util/account.c
index b3f65f82..bb1b1bc4 100644
--- a/util/account.c
+++ b/util/account.c
@@ -1,7 +1,7 @@
/* $Id$ */
#include "bbs.h"
-#define MAX_LINE 16
+#define ACCOUNT_MAX_LINE 16
#define ADJUST_M 6 /* adjust back 5 minutes */
void
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
mahour = i;
}
}
- item = max / MAX_LINE + 1;
+ item = max / ACCOUNT_MAX_LINE + 1;
if (!ptime->tm_hour)
{
@@ -171,7 +171,7 @@ int main(int argc, char **argv)
return 1;
}
fprintf(fp, "\t\t\t 每小時上站人次統計 [%02d/%02d/%02d] \n\n", ptime->tm_year % 100, ptime->tm_mon + 1, ptime->tm_mday);
- for (i = MAX_LINE + 1; i > 0; i--)
+ for (i = ACCOUNT_MAX_LINE + 1; i > 0; i--)
{
strcpy(buf, " ");
for (j = 0; j < 24; j++)
diff --git a/util/yearsold.c b/util/yearsold.c
index f93134a6..b4b0d176 100644
--- a/util/yearsold.c
+++ b/util/yearsold.c
@@ -3,7 +3,7 @@
#define _UTIL_C_
#include "bbs.h"
-#define MAX_LINE 16
+#define YEARSOLD_MAX_LINE 16
struct userec_t cuser;
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
}
}
- item = max / MAX_LINE + 1;
+ item = max / YEARSOLD_MAX_LINE + 1;
if ((fp = fopen(BBSHOME"/etc/yearsold", "w")) == NULL)
{
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
fprintf(fp, "\t\t\t  " BBSNAME
" 年齡統計 [%02d/%02d/%02d] \n\n",
ptime->tm_year % 100, ptime->tm_mon + 1, ptime->tm_mday);
- for (i = MAX_LINE + 1; i > 0; i--)
+ for (i = YEARSOLD_MAX_LINE + 1; i > 0; i--)
{
strcpy(buf, " ");
for (j = 0; j < 24; j++)