* Using 'inline' now no longer using '__inline__'

svn: 1075

src/botmsg.c

@@ -387,7 +387,7 @@ void botnet_send_reject(int idx, char *fromp, char *frombot, char *top, char *to
   tputs(dcc[idx].sock, OBUF, len);
 }
 
-__inline__ void putallbots(char *par)
+inline void putallbots(char *par)
 { 
   botnet_send_zapf_broad(-1, conf.bot->nick, NULL, par);
 }

src/botmsg.h

@@ -16,7 +16,7 @@
 void botnet_send_cfg(int idx, struct cfg_entry *entry);
 void botnet_send_cfg_broad(int idx, struct cfg_entry *entry);
 void putbot(char *, char *);
-__inline__ void putallbots(char *);
+inline void putallbots(char *);
 int add_note(char *, char *, char *, int, int);
 size_t simple_sprintf (char *, ...);
 char *int_to_base10(int);

src/compat/gnu_strftime.c

@@ -336,7 +336,7 @@ tm_diff (a, b)
 #define YDAY_MINIMUM (-366)
 static int iso_week_days __P ((int, int));
 #ifdef __GNUC__
-____inline____
+__inline__
 #endif
 static int
 iso_week_days (yday, wday)

src/dccutil.c

@@ -438,7 +438,7 @@ void set_away(int idx, char *s)
 
 /* Make a password, 10-14 random letters and digits
  */
-__inline__ void makepass(char *s)
+inline void makepass(char *s)
 {
   make_rand_str(s, 10 + randint(5));
 }

src/dccutil.h

@@ -31,7 +31,7 @@ void chatout(const char *, ...) __attribute__((format(printf, 1, 2)));
 void chanout_but(int, int, const char *, ...) __attribute__((format(printf, 3, 4)));
 void dcc_chatter(int);
 void lostdcc(int);
-__inline__ void makepass(char *);
+inline void makepass(char *);
 void tell_dcc(int);
 void not_away(int);
 void set_away(int, char *);

src/misc.c

@@ -635,7 +635,7 @@ char *strchr_unescape(char *str, const char divc, register const char esc_char)
 /* As strchr_unescape(), but converts the complete string, without
  * searching for a specific delimiter character.
  */
-__inline__ void str_unescape(char *str, register const char esc_char)
+inline void str_unescape(char *str, register const char esc_char)
 {
   (void) strchr_unescape(str, 0, esc_char);
 }

src/misc.h

@@ -60,7 +60,7 @@ void show_banner(int);
 void make_rand_str(char *, int);
 char *str_escape(const char *, const char, const char);
 char *strchr_unescape(char *, const char, register const char);
-__inline__ void str_unescape(char *, register const char);
+inline void str_unescape(char *, register const char);
 int str_isdigit(const char *);
 void kill_bot(char *, char *);
 

src/mod/channels.mod/channels.c

@@ -626,7 +626,7 @@ int ismasked(masklist *m, const char *username)
 
 /* Unlink chanset element from chanset list.
  */
-__inline__ static int chanset_unlink(struct chanset_t *chan)
+inline static int chanset_unlink(struct chanset_t *chan)
 {
   struct chanset_t *c = NULL, *c_old = NULL;
 

src/mod/channels.mod/channels.h

@@ -24,7 +24,7 @@ static void tell_exempts (int idx, int show_inact, char * match);
 static void tell_invites (int idx, int show_inact, char * match);
 static void get_mode_protect(struct chanset_t *chan, char *s);
 static void set_mode_protect(struct chanset_t *chan, char *set);
-__inline__ static int chanset_unlink(struct chanset_t *chan);
+inline static int chanset_unlink(struct chanset_t *chan);
 
 #endif				/* MAKING_CHANNELS */
 

src/mod/compress.mod/compress.c

@@ -168,7 +168,7 @@ static int uncompress_to_file(char *f_src, char *f_target)
 
 /* Enforce limits.
  */
-__inline__ static void adjust_mode_num(int *mode)
+inline static void adjust_mode_num(int *mode)
 {
   if (*mode > 9)
     *mode = 9;

src/mod/dns.mod/coredns.c

@@ -221,14 +221,14 @@ static struct resolve *allocresolve()
 
 /* Return the hash bucket number for id.
  */
-__inline__ static u_32bit_t getidbash(u_16bit_t id)
+inline static u_32bit_t getidbash(u_16bit_t id)
 {
     return (u_32bit_t) BASH_MODULO(id);
 }
 
 /* Return the hash bucket number for ip.
  */
-__inline__ static u_32bit_t getipbash(IP ip)
+inline static u_32bit_t getipbash(IP ip)
 {
     return (u_32bit_t) BASH_MODULO(ip);
 }

src/mod/server.mod/server.h

@@ -41,7 +41,7 @@ enum {
 #endif		/* _EGG_MOD_SERVER_SERVER_H */
 
 void nuke_server(char *);
-__inline__ int match_my_nick(char *);
+inline int match_my_nick(char *);
 
 extern bind_table_t	*BT_ctcp, *BT_ctcr;
 #ifdef S_MSGCMDS

src/mod/server.mod/servmsg.c

@@ -163,7 +163,7 @@ int check_bind_ctcpr(char *nick, char *uhost, struct userrec *u,
 }
 
 
-__inline__ int match_my_nick(char *nick)
+inline int match_my_nick(char *nick)
 {
   return (!rfc_casecmp(nick, botname));
 }

src/mod/transfer.mod/transfer.c

@@ -464,7 +464,7 @@ static void eof_dcc_send(int idx)
 #ifdef HUB
 /* Determine byte order. Used for resend DCC startup packets.
  */
-static __inline__ u_8bit_t byte_order_test(void)
+static inline u_8bit_t byte_order_test(void)
 {
   u_16bit_t test = TRANSFER_REGET_PACKETID;
 
@@ -477,7 +477,7 @@ static __inline__ u_8bit_t byte_order_test(void)
 
 /* Parse and handle resend DCC startup packets.
  */
-__inline__ static void handle_resend_packet(int idx, transfer_reget *reget_data)
+inline static void handle_resend_packet(int idx, transfer_reget *reget_data)
 {
   if (byte_order_test() != reget_data->byte_order) {
     /* The sender's byte order does not match our's so we need to switch the

src/net.c

@@ -809,7 +809,7 @@ int open_address_listen(IP addr, port_t int *port)
 /* Returns a socket number for a listening socket that will accept any
  * connection -- port # is returned in port
  */
-__inline__ int open_listen(port_t *port)
+inline int open_listen(port_t *port)
 {
 #ifdef USE_IPV6
   return open_address_listen(conf.bot->ip ? getmyip() : INADDR_ANY, AF_INET, port);
@@ -822,7 +822,7 @@ __inline__ int open_listen(port_t *port)
  * the above is being left in for compatibility, and should NOT LONGER BE USED IN THE CORE CODE.
  */
 
-__inline__ int open_listen_by_af(port_t *port, int af_def)
+inline int open_listen_by_af(port_t *port, int af_def)
 {
 #ifdef USE_IPV6
   return open_address_listen(conf.bot->ip ? getmyip() : INADDR_ANY, af_def, port);
@@ -1212,7 +1212,7 @@ static int sockread(char *s, int *len)
   return -3;
 }
 
-__inline__ static int 
+inline static int 
 prand(int *seed, int range)
 {
   long long i1;

src/net.h

@@ -148,8 +148,8 @@ void dropssl(int);
 void real_killsock(int, const char *, int);
 int answer(int, char *, IP *, port_t *, int);
 int findanyidx(register int);
-__inline__ int open_listen(port_t *);
-__inline__ int open_listen_by_af(port_t *, int);
+inline int open_listen(port_t *);
+inline int open_listen_by_af(port_t *, int);
 #ifdef USE_IPV6
 int open_address_listen(IP, int, port_t *);
 #else