summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorwens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-12-11 14:22:00 +0800
committerwens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-12-11 14:22:00 +0800
commitd119f8212a81355170936d54a78ad125b8003ee0 (patch)
tree06c988ea61196bdc6f9087b782edc0558249e75c /include
parent9b1c3c59308cfa4394628e40d354fefed09f949d (diff)
downloadpttbbs-d119f8212a81355170936d54a78ad125b8003ee0.tar
pttbbs-d119f8212a81355170936d54a78ad125b8003ee0.tar.gz
pttbbs-d119f8212a81355170936d54a78ad125b8003ee0.tar.bz2
pttbbs-d119f8212a81355170936d54a78ad125b8003ee0.tar.lz
pttbbs-d119f8212a81355170936d54a78ad125b8003ee0.tar.xz
pttbbs-d119f8212a81355170936d54a78ad125b8003ee0.tar.zst
pttbbs-d119f8212a81355170936d54a78ad125b8003ee0.zip
merge ptt.linux again
WARNING! There are some major differences in SHM_t. All pointers storing offsets in SHM_t have been changed to indexes. When updating to this revision, please rebuild the whole tree and restart the entire BBS system (kill all users first, stop, and start). git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2374 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'include')
-rw-r--r--include/pttstruct.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/pttstruct.h b/include/pttstruct.h
index 23979723..0fdc8921 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -175,9 +175,9 @@ typedef struct boardheader_t {
unsigned int level; /* 可以看此板的權限 */
int unused; /* 還沒用到 */
int gid; /* 看板所屬的類別 ID */
- void *next[2]; /* 在同一個gid下一個看板 動態產生*/
- void *firstchild[2]; /* 屬於這個看板的第一個子看板 */
- void *parent;
+ int next[2]; /* 在同一個gid下一個看板 動態產生*/
+ int firstchild[2]; /* 屬於這個看板的第一個子看板 */
+ int parent;
int childcount; /* 有多少個child */
int nuser; /* 多少人在這板 */
int postexpire; /* postexpire */
@@ -449,7 +449,7 @@ typedef struct {
/* utmpshm */
userinfo_t uinfo[USHM_SIZE];
- userinfo_t *sorted[2][8][USHM_SIZE];
+ int sorted[2][8][USHM_SIZE];
/* 第一維double buffer 由currsorted指向目前使用的
第二維sort type */
int currsorted;
@@ -461,10 +461,10 @@ typedef struct {
/* brdshm */
int BMcache[MAX_BOARD][MAX_BMs];
boardheader_t bcache[MAX_BOARD];
- boardheader_t *bsorted[2][MAX_BOARD]; /* 0: by name 1: by class */
+ int bsorted[2][MAX_BOARD]; /* 0: by name 1: by class */
#if HOTBOARDCACHE
unsigned char nHOTs;
- boardheader_t *HBcache[HOTBOARDCACHE];
+ int HBcache[HOTBOARDCACHE];
#endif
time_t busystate_b[MAX_BOARD];
int total[MAX_BOARD];