From bdb3cd081a694f8f6924e399d944e32c1578235c Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 22 Jul 2015 11:03:27 +0200 Subject: [PATCH] Remove inline keyword Fixes GCC5.x compilation issues related to C99 inline semantics. Signed-off-by: Yegor Yefremov --- socketcand.h | 8 ++++---- state_bcm.c | 2 +- state_control.c | 2 +- state_isotp.c | 2 +- state_raw.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/socketcand.h b/socketcand.h index a287fe2..39eef83 100644 --- a/socketcand.h +++ b/socketcand.h @@ -27,10 +27,10 @@ #undef DEBUG_RECEPTION -inline void state_bcm(); -inline void state_raw(); -inline void state_isotp(); -inline void state_control(); +void state_bcm(); +void state_raw(); +void state_isotp(); +void state_control(); extern int client_socket; extern char **interface_names; diff --git a/state_bcm.c b/state_bcm.c index c63a0a9..0c980fa 100644 --- a/state_bcm.c +++ b/state_bcm.c @@ -28,7 +28,7 @@ int sc = -1; fd_set readfds; struct timeval tv; -inline void state_bcm() { +void state_bcm() { int i, ret; struct sockaddr_can caddr; socklen_t caddrlen = sizeof(caddr); diff --git a/state_control.c b/state_control.c index 5f62b74..baa9df6 100644 --- a/state_control.c +++ b/state_control.c @@ -17,7 +17,7 @@ #include #include -inline void state_control() { +void state_control() { char buf[MAXLEN]; int i, items; diff --git a/state_isotp.c b/state_isotp.c index ae66035..4005f94 100644 --- a/state_isotp.c +++ b/state_isotp.c @@ -24,7 +24,7 @@ int si = -1; fd_set readfds; -inline void state_isotp() { +void state_isotp() { int i, items, ret; struct sockaddr_can addr; diff --git a/state_raw.c b/state_raw.c index 1bd2ece..99111ae 100644 --- a/state_raw.c +++ b/state_raw.c @@ -31,7 +31,7 @@ char ctrlmsg[CMSG_SPACE(sizeof(struct timeval)) + CMSG_SPACE(sizeof(__u32))]; struct timeval tv; struct cmsghdr *cmsg; -inline void state_raw() { +void state_raw() { char buf[MAXLEN]; int i, ret, items; -- 2.1.4