diff options
| author | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2006-03-13 00:05:11 +0800 |
|---|---|---|
| committer | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2006-03-13 00:05:11 +0800 |
| commit | ef057a26d72d1ad6d0e43dd46749eb4748fcbefd (patch) | |
| tree | 417c84c8645a2952ffcdf0efb75f0521a2b6fc45 /mbbsd | |
| parent | 91f340fbe073394db064cb97a88ccc95717d052a (diff) | |
| download | pttbbs-ef057a26d72d1ad6d0e43dd46749eb4748fcbefd.tar pttbbs-ef057a26d72d1ad6d0e43dd46749eb4748fcbefd.tar.gz pttbbs-ef057a26d72d1ad6d0e43dd46749eb4748fcbefd.tar.bz2 pttbbs-ef057a26d72d1ad6d0e43dd46749eb4748fcbefd.tar.lz pttbbs-ef057a26d72d1ad6d0e43dd46749eb4748fcbefd.tar.xz pttbbs-ef057a26d72d1ad6d0e43dd46749eb4748fcbefd.tar.zst pttbbs-ef057a26d72d1ad6d0e43dd46749eb4748fcbefd.zip | |
avoid C++ keywords to make include files C++ friendly.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3279 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd')
| -rw-r--r-- | mbbsd/friend.c | 6 | ||||
| -rw-r--r-- | mbbsd/talk.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mbbsd/friend.c b/mbbsd/friend.c index e313f026..bde8e78d 100644 --- a/mbbsd/friend.c +++ b/mbbsd/friend.c @@ -188,14 +188,14 @@ friend_delete(const char *uident, int type) } static void -delete_user_friend(const char *uident, const char *friend, int type) +delete_user_friend(const char *uident, const char *thefriend, int type) { char fn[80]; #if 0 if (type == FRIEND_ALOHA) { #endif sethomefile(fn, uident, "aloha"); - file_delete_line(fn, friend, 0); + file_delete_line(fn, thefriend, 0); #if 0 } else { @@ -287,7 +287,7 @@ void friend_load(int type) { if (!type || type & FRIEND_OVERRIDE) friend_load_real(1, MAX_FRIEND, &currutmp->nFriends, - currutmp->friend, fn_overrides); + currutmp->myfriend, fn_overrides); if (!type || type & FRIEND_REJECT) friend_load_real(0, MAX_REJECT, NULL, currutmp->reject, fn_reject); diff --git a/mbbsd/talk.c b/mbbsd/talk.c index f5e0f9ad..9d627ab2 100644 --- a/mbbsd/talk.c +++ b/mbbsd/talk.c @@ -167,11 +167,11 @@ set_friend_bit(const userinfo_t * me, const userinfo_t * ui) const int *myfriends; /* 判斷對方是否為我的朋友 ? */ - if( intbsearch(ui->uid, me->friend, me->nFriends) ) + if( intbsearch(ui->uid, me->myfriend, me->nFriends) ) hit = IFH; /* 判斷我是否為對方的朋友 ? */ - if( intbsearch(me->uid, ui->friend, ui->nFriends) ) + if( intbsearch(me->uid, ui->myfriend, ui->nFriends) ) hit |= HFM; /* 判斷對方是否為我的仇人 ? */ @@ -259,7 +259,7 @@ void login_friend_online(void) verbose_progress(0, &iBar, &dir, barMax); if( towrite(sfd, &offset, sizeof(offset)) > 0 && towrite(sfd, &currutmp->uid, sizeof(currutmp->uid)) > 0 && - towrite(sfd, currutmp->friend, sizeof(currutmp->friend)) > 0 && + towrite(sfd, currutmp->myfriend, sizeof(currutmp->myfriend)) > 0 && towrite(sfd, currutmp->reject, sizeof(currutmp->reject)) > 0 ){ ocfs_t fs; |