diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2014-02-23 15:14:38 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2014-02-23 15:14:38 +0800 |
| commit | 62bc73af704141f8c18c9bbc6ff7ee2d69459bd6 (patch) | |
| tree | 1b644548d883a3c5dd02443bedb3d2312c01966a | |
| parent | 5d3b979dd8541aabb3f2ba3552d8847c07d4cf8c (diff) | |
| download | pttbbs-62bc73af704141f8c18c9bbc6ff7ee2d69459bd6.tar pttbbs-62bc73af704141f8c18c9bbc6ff7ee2d69459bd6.tar.gz pttbbs-62bc73af704141f8c18c9bbc6ff7ee2d69459bd6.tar.bz2 pttbbs-62bc73af704141f8c18c9bbc6ff7ee2d69459bd6.tar.lz pttbbs-62bc73af704141f8c18c9bbc6ff7ee2d69459bd6.tar.xz pttbbs-62bc73af704141f8c18c9bbc6ff7ee2d69459bd6.tar.zst pttbbs-62bc73af704141f8c18c9bbc6ff7ee2d69459bd6.zip | |
Prevent data structure difference by #ifdefs.
NOTE You may need to recompile and restart BBS after applying this commit,
if you don't have OUTTA_TIMER in pttbbs.conf.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5939 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | pttbbs/UPDATING | 5 | ||||
| -rw-r--r-- | pttbbs/include/pttstruct.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pttbbs/UPDATING b/pttbbs/UPDATING index 96cfcbb2..766d0975 100644 --- a/pttbbs/UPDATING +++ b/pttbbs/UPDATING @@ -23,6 +23,11 @@ https://opensvn.csie.org/traccgi/pttbbs/changeset/2273 make r4871_uflag ----------------------------------------------------------------------------- +r5939: [shm] +為了減少昇級 BBS 時資料結構不相容的情形，SHM 裡的 "now" 現在變為一直都有 +（即使沒開 OUTTA_TIMER 選項）。如果您的 BBS 沒開 OUTTA_TIMER 請記得打開後 +重編 + 重跑，或是手動把 now 移掉。 + r5885: [expire] util/expire 格式修改，不再看 days/minp. 為避免誤砍，設定檔也同時改名為 expire2.conf。請自行調整。 diff --git a/pttbbs/include/pttstruct.h b/pttbbs/include/pttstruct.h index ffe914cf..90f34a73 100644 --- a/pttbbs/include/pttstruct.h +++ b/pttbbs/include/pttstruct.h @@ -574,9 +574,7 @@ typedef struct { int dymaxactive; /* 動態設定最大人數上限 */ int toomanyusers; /* 超過人數上限不給進的個數 */ int noonlineuser; /* 站上使用者不高亮度顯示 */ -#ifdef OUTTA_TIMER time4_t now; -#endif int nWelcomes; int shutdown; /* shutdown flag */ |