From 88621d73980a3cb53c1f35e64a06d7cd64188987 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Tue, 29 Aug 2006 19:41:06 +0000
Subject: Svn 16007 broke the build under gcc 4.0.3.  This fixes up some of the
 damage (the e2fsprogs directory is too twisty and evil to easily fix, but I
 plan to rewrite it anyway so I'll just bump that up in priority a bit).

---
 networking/fakeidentd.c |  4 ++--
 networking/telnet.c     | 16 ++++++++--------
 networking/zcip.c       |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'networking')

diff --git a/networking/fakeidentd.c b/networking/fakeidentd.c
index 6ee7c328e..b965147e1 100644
--- a/networking/fakeidentd.c
+++ b/networking/fakeidentd.c
@@ -64,7 +64,7 @@ static void replyError(int s, char *buf);
 static const char *nobodystr = "nobody"; /* this needs to be declared like this */
 static char *bind_ip_address = "0.0.0.0";
 
-static inline void movefd(int from, int to)
+static void movefd(int from, int to)
 {
 	if (from != to) {
 		dup2(from, to);
@@ -108,7 +108,7 @@ static void handlexitsigs(int signum)
 }
 
 /* May succeed. If not, won't care. */
-static inline void writepid(uid_t nobody, uid_t nogrp)
+static void writepid(uid_t nobody, uid_t nogrp)
 {
 	char buf[24];
 	int fd = open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0664);
diff --git a/networking/telnet.c b/networking/telnet.c
index 59268c6de..5324d7a20 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -88,7 +88,7 @@ struct Globalvars * Gptr;
 #define G (*Gptr)
 #endif
 
-static inline void iacflush(void)
+static void iacflush(void)
 {
 	write(G.netfd, G.iacbuf, G.iaclen);
 	G.iaclen = 0;
@@ -291,7 +291,7 @@ static void handlenetinput(int len)
 
 /* ******************************* */
 
-static inline void putiac(int c)
+static void putiac(int c)
 {
 	G.iacbuf[G.iaclen++] = c;
 }
@@ -428,13 +428,13 @@ static void do_linemode(void)
 
 /* ******************************* */
 
-static inline void to_notsup(char c)
+static void to_notsup(char c)
 {
 	if      (G.telwish == WILL)	putiac2(DONT, c);
 	else if (G.telwish == DO)	putiac2(WONT, c);
 }
 
-static inline void to_echo(void)
+static void to_echo(void)
 {
 	/* if server requests ECHO, don't agree */
 	if      (G.telwish == DO) {	putiac2(WONT, TELOPT_ECHO);	return; }
@@ -461,7 +461,7 @@ static inline void to_echo(void)
 	WriteCS(1, "\r\n");  /* sudden modec */
 }
 
-static inline void to_sga(void)
+static void to_sga(void)
 {
 	/* daemon always sends will/wont, client do/dont */
 
@@ -483,7 +483,7 @@ static inline void to_sga(void)
 }
 
 #ifdef CONFIG_FEATURE_TELNET_TTYPE
-static inline void to_ttype(void)
+static void to_ttype(void)
 {
 	/* Tell server we will (or won't) do TTYPE */
 
@@ -497,7 +497,7 @@ static inline void to_ttype(void)
 #endif
 
 #ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN
-static inline void to_new_environ(void)
+static void to_new_environ(void)
 {
 	/* Tell server we will (or will not) do AUTOLOGIN */
 
@@ -511,7 +511,7 @@ static inline void to_new_environ(void)
 #endif
 
 #ifdef CONFIG_FEATURE_AUTOWIDTH
-static inline void to_naws(void)
+static void to_naws(void)
 {
 	/* Tell server we will do NAWS */
 	putiac2(WILL, TELOPT_NAWS);
diff --git a/networking/zcip.c b/networking/zcip.c
index 5e1067377..d49bb7669 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -173,7 +173,7 @@ bad:
 /**
  * Return milliseconds of random delay, up to "secs" seconds.
  */
-static inline unsigned ms_rdelay(unsigned secs)
+static unsigned ATTRIBUTE_ALWAYS_INLINE ms_rdelay(unsigned secs)
 {
 	return lrand48() % (secs * 1000);
 }
-- 
cgit v1.2.3