Remove inline from ppp_output() function to fix building with LLVM.

ok yasuoka@ millert@

2 files changed, 5 insertions, 5 deletions

diff --git a/usr.sbin/npppd/npppd/ppp.c b/usr.sbin/npppd/npppd/ppp.c
index 4ffe1cb8c0e..740ccf708c4 100644
--- a/usr.sbin/npppd/npppd/ppp.c
+++ b/usr.sbin/npppd/npppd/ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp.c,v 1.16 2012/09/18 13:14:08 yasuoka Exp $ */
+/*	$OpenBSD: ppp.c,v 1.17 2013/01/07 18:12:08 brad Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: ppp.c,v 1.16 2012/09/18 13:14:08 yasuoka Exp $ */
+/* $Id: ppp.c,v 1.17 2013/01/07 18:12:08 brad Exp $ */
 /**@file
  * This file provides PPP(Point-to-Point Protocol, RFC 1661) and
  * {@link :: _npppd_ppp PPP instance} related functions.
@@ -964,7 +964,7 @@ handled:
 }
 
 /** This function is called to output PPP packets */
-inline void
+void
 ppp_output(npppd_ppp *_this, uint16_t proto, u_char code, u_char id,
     u_char *datap, int ldata)
 {
diff --git a/usr.sbin/npppd/npppd/ppp.h b/usr.sbin/npppd/npppd/ppp.h
index 3492df4937c..e01c8260cda 100644
--- a/usr.sbin/npppd/npppd/ppp.h
+++ b/usr.sbin/npppd/npppd/ppp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp.h,v 1.13 2012/09/18 13:14:08 yasuoka Exp $ */
+/*	$OpenBSD: ppp.h,v 1.14 2013/01/07 18:12:08 brad Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -770,7 +770,7 @@ void         ppp_auth_ok (npppd_ppp *);
 void         ppp_ipcp_opened (npppd_ppp *);
 void         ppp_ccp_opened (npppd_ppp *);
 void         ppp_ccp_stopped (npppd_ppp *);
-inline void  ppp_output (npppd_ppp *, uint16_t, u_char, u_char, u_char *, int);
+void         ppp_output (npppd_ppp *, uint16_t, u_char, u_char, u_char *, int);
 u_char       *ppp_packetbuf (npppd_ppp *, int);
 int          ppp_log (npppd_ppp *, int, const char *, ...) __printflike(3,4);
 void         ppp_reset_idle_timeout(npppd_ppp *);