svn: 1310

src/flags.c

@@ -394,7 +394,7 @@ get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chname)
  * This function does not check if the user has "op" access, it only checks if the user is
  * restricted by +private for the channel
  */
-inline int
+int
 private(struct flag_record fr, struct chanset_t *chan, int type)
 {
   if (!chan || !channel_private(chan) || glob_bot(fr) || glob_owner(fr))
@@ -411,7 +411,7 @@ private(struct flag_record fr, struct chanset_t *chan, int type)
   return 1;                     /* user is restricted by +private */
 }
 
-inline int
+int
 chk_op(struct flag_record fr, struct chanset_t *chan)
 {
   if (!chan || (!private(fr, chan, PRIV_OP) && !chk_deop(fr))) {
@@ -421,7 +421,7 @@ chk_op(struct flag_record fr, struct chanset_t *chan)
   return 0;
 }
 
-inline int
+int
 chk_autoop(struct flag_record fr, struct chanset_t *chan)
 {
   if (glob_bot(fr))
@@ -433,7 +433,7 @@ chk_autoop(struct flag_record fr, struct chanset_t *chan)
   return 0;
 }
 
-inline int
+int
 chk_deop(struct flag_record fr)
 {
   if (chan_deop(fr) || (glob_deop(fr) && !chan_op(fr)))
@@ -442,7 +442,7 @@ chk_deop(struct flag_record fr)
     return 0;
 }
 
-inline int
+int
 chk_voice(struct flag_record fr, struct chanset_t *chan)
 {
   if (!chan || (!private(fr, chan, PRIV_VOICE) && !chk_devoice(fr))) {
@@ -452,7 +452,7 @@ chk_voice(struct flag_record fr, struct chanset_t *chan)
   return 0;
 }
 
-inline int
+int
 chk_devoice(struct flag_record fr)
 {
   if (chan_quiet(fr) || (glob_quiet(fr) && !chan_voice(fr)))
@@ -461,13 +461,13 @@ chk_devoice(struct flag_record fr)
     return 0;
 }
 
-inline int
+int
 chk_noflood(struct flag_record fr)
 {
   return (chan_noflood(fr) || glob_noflood(fr));
 }
 
-inline int
+int
 isupdatehub()
 {
 #ifdef HUB
@@ -478,7 +478,7 @@ isupdatehub()
     return 0;
 }
 
-inline int
+int
 ischanhub()
 {
   if (conf.bot->u && (conf.bot->u->flags & USER_CHANHUB))

src/flags.h

@@ -135,16 +135,15 @@ int flagrec_ok(struct flag_record *, struct flag_record *);
 flag_t sanity_check(flag_t, int);
 flag_t chan_sanity_check(flag_t);
 char geticon(int);
-
-inline int private(struct flag_record, struct chanset_t *, int);
-inline int chk_op(struct flag_record, struct chanset_t *);
-inline int chk_autoop(struct flag_record, struct chanset_t *);
-inline int chk_deop(struct flag_record);
-inline int chk_voice(struct flag_record, struct chanset_t *);
-inline int chk_devoice(struct flag_record);
-inline int chk_noflood(struct flag_record);
-inline int ischanhub();
-inline int isupdatehub();
+int private(struct flag_record, struct chanset_t *, int);
+int chk_op(struct flag_record, struct chanset_t *);
+int chk_autoop(struct flag_record, struct chanset_t *);
+int chk_deop(struct flag_record);
+int chk_voice(struct flag_record, struct chanset_t *);
+int chk_devoice(struct flag_record);
+int chk_noflood(struct flag_record);
+int ischanhub();
+int isupdatehub();
 int dovoice(struct chanset_t *);
 int dolimit(struct chanset_t *);
 int whois_access(struct userrec *, struct userrec *);