* Inlining work

svn: 1272

Makefile.in

@@ -34,8 +34,8 @@ STRIP = @STRIP@
 #LIBS = @LIBS@ @ZLIB@ @SSL@ @RESLIB@
 LIBS = @LIBS@ @ZLIB@ @RESLIB@
 
-DEBCFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM -Dinline= -g3 -ggdb3
-CFLGS = -fno-strict-aliasing -W -Wformat -Winline \
+DEBCFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM -Dinline= -fno-inline -g3 -ggdb3
+CFLGS = -fno-strict-aliasing -W -Wformat \
 -Wshadow -Wnested-externs -Wno-format-y2k \
 -Wlarger-than-2048 -Wpointer-arith -Wcast-align \
 -Waggrepate-return -Wbad-function-cast \

src/dccutil.c

@@ -485,7 +485,7 @@ void set_away(int idx, char *s)
 
 /* Make a password, 10-14 random letters and digits
  */
-inline void makepass(char *s)
+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 *);
+void makepass(char *);
 void tell_dcc(int);
 void not_away(int);
 void set_away(int, char *);

src/mod/channels.mod/channels.c

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

src/mod/channels.mod/channels.h

@@ -22,7 +22,6 @@ 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);
 
 #endif				/* MAKING_CHANNELS */
 

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 *);
+extern inline int match_my_nick(char *);
 
 extern bind_table_t	*BT_ctcp, *BT_ctcr, *BT_msgc;
 extern int 		serv, servidx, cycle_time, newserverport,