diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2007-12-05 21:06:28 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2007-12-05 21:06:28 +0800 |
| commit | ef6481cca41aca3c247f845ef55a9b2cd491be65 (patch) | |
| tree | 140b45a376365aa29c30cd0126afbf8edeea6ba2 | |
| parent | 97e5db2272665daf9883e29b183a734daf9c79e6 (diff) | |
| download | pttbbs-ef6481cca41aca3c247f845ef55a9b2cd491be65.tar pttbbs-ef6481cca41aca3c247f845ef55a9b2cd491be65.tar.gz pttbbs-ef6481cca41aca3c247f845ef55a9b2cd491be65.tar.bz2 pttbbs-ef6481cca41aca3c247f845ef55a9b2cd491be65.tar.lz pttbbs-ef6481cca41aca3c247f845ef55a9b2cd491be65.tar.xz pttbbs-ef6481cca41aca3c247f845ef55a9b2cd491be65.tar.zst pttbbs-ef6481cca41aca3c247f845ef55a9b2cd491be65.zip | |
- definition and macro fix after sync with PTT1
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3640 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | include/config.h | 4 | ||||
| -rw-r--r-- | include/uflags.h | 1 | ||||
| -rw-r--r-- | mbbsd/brc.c | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/include/config.h b/include/config.h index ff5006a0..80a3e403 100644 --- a/include/config.h +++ b/include/config.h @@ -295,10 +295,6 @@ #define ALLHIDPOST "ALLHIDPOST" #define MAXTAGS 256 -#define BRC_STRLEN 15 /* Length of board name */ -#define BRC_MAXSIZE 49152 -#define BRC_MAXNUM 80 - #define WRAPMARGIN (511) #endif diff --git a/include/uflags.h b/include/uflags.h index 1686c98e..752dc73a 100644 --- a/include/uflags.h +++ b/include/uflags.h @@ -60,6 +60,7 @@ #define ANGEL_R_MAEL 0x00001000 /* true if reject male */ #define ANGEL_R_FEMAEL 0x00002000 /* true if reject female */ #define ANGEL_MASK 0x00003000 +#define REJECT_QUESTION (cuser.uflag2 & REJ_QUESTION) #define ANGEL_STATUS() ((cuser.uflag2 & ANGEL_MASK) >> 12) #define ANGEL_SET(X) (cuser.uflag2 = (cuser.uflag2 & ~ANGEL_MASK) | \ (((X) & 3) << 12)) diff --git a/mbbsd/brc.c b/mbbsd/brc.c index be242367..4317dfd1 100644 --- a/mbbsd/brc.c +++ b/mbbsd/brc.c @@ -7,20 +7,20 @@ * original time_t as 'create'. */ -// WARNING: Check ../include/config.h, you may have overide these value there +// WARNING: Check ../pttbbs.conf, you may have overide these value there +// TODO MAXSIZE may be better smaller to fit into memory page. #ifndef BRC_MAXNUM -#define BRC_STRLEN 15 /* Length of board name, for old brc */ #define BRC_MAXSIZE 49152 /* Effective size of brc rc file, 8192 * 3 * 2 */ #define BRC_MAXNUM 80 /* Upper bound of brc_num, size of brc_list */ #endif #define BRC_BLOCKSIZE 1024 -// Note: BRC v3 should already support MAX_BOARD > 65535, +// Note: BRC v3 should already support MAX_BOARD > 65535 and BRC_MAXSIZE > 65535, // but not widely tested yet. #if MAX_BOARD > 65535 || BRC_MAXSIZE > 65535 #error Max number of boards or BRC_MAXSIZE cannot fit in unsigned short, \ -please rewrite brc.c +please rewrite brc.c (v2) #endif typedef uint32_t brcbid_t; |