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

4 files changed, 9 insertions, 9 deletions

diff --git a/include/proto.h b/include/proto.h
index 6faa25de..fb26c5c4 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -230,7 +230,7 @@ fav_t *get_current_fav(void);
 int get_item_type(fav_type_t *ft);
 char *get_item_title(fav_type_t *ft);
 char *get_folder_title(int fid);
-void set_attr(fav_type_t *ft, int bit, char bool);
+void set_attr(fav_type_t *ft, int bit, char boolean);
 void fav_sort_by_name(void);
 void fav_sort_by_class(void);
 int fav_load(void);
@@ -243,7 +243,7 @@ char getbrdattr(short bid);
 time4_t getbrdtime(short bid);
 void setbrdtime(short bid, time4_t t);
 int fav_getid(fav_type_t *ft);
-void fav_tag(short id, char type, char bool);
+void fav_tag(short id, char type, char boolean);
 void move_in_current_folder(int from, int to);
 void fav_move(int from, int to);
 fav_type_t *fav_add_line(void);
diff --git a/include/pttstruct.h b/include/pttstruct.h
index 575dd76d..8b6d6c97 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -367,7 +367,7 @@ typedef struct userinfo_t {
     int     friendtotal;              /* 好友比較的cache 大小 */ 
     short   nFriends;                /* 下面 friend[] 只用到前幾個,
                                         用來 bsearch */
-    int     friend[MAX_FRIEND];
+    int     myfriend[MAX_FRIEND];
     char    gap_1[4];
     int     friend_online[MAX_FRIEND];/* point到線上好友 utmpshm的位置 */
 			          /* 好友比較的cache 前兩個bit是狀態 */
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;