can-utils: cleanup headers

- add missing sys/socket.h: on some systems (like Android)
have SOCK_RAW definition directly in sys/socket.h

- use sys/wait.h instead if wait.h

- include termios.h explicitly (Android)

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/canlogserver.c b/canlogserver.c
index b5a9d73339bfa8a0544bf66ccfc29cc9ea6fa685..b6fa40305592ac548f85b7dd70acc510260a13df 100644 (file)
--- a/canlogserver.c
+++ b/canlogserver.c
@@ -55,6 +55,7 @@
 #include <time.h>
 
 #include <sys/time.h>
+#include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
@@ -65,7 +66,6 @@
 #include <linux/can.h>
 #include <linux/can/raw.h>
 #include <signal.h>
-#include <wait.h>
 #include <errno.h>
 
 #include "lib.h"

diff --git a/canplayer.c b/canplayer.c
index ff05f0f0d505c4177e8d51393b5386a7e94d4b48..b0b63334e711ceebd56dd9b1fddf535d226fb637 100644 (file)
--- a/canplayer.c
+++ b/canplayer.c
@@ -53,6 +53,7 @@
 #include <unistd.h>
 
 #include <net/if.h>
+#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <linux/can.h>

diff --git a/cansend.c b/cansend.c
index 5c71cfdff6b804dafd6dd6e5ed209c3691990bc2..9be216337cfff5f5c5fa441b2532901562cf97b2 100644 (file)
--- a/cansend.c
+++ b/cansend.c
@@ -52,6 +52,7 @@
 
 #include <net/if.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 
 #include <linux/can.h>
 #include <linux/can/raw.h>

diff --git a/slcan_attach.c b/slcan_attach.c
index b939a103cf43a19ed260340e69d345839c41f768..3d6846ac40b2768dd38be981d69b25584b7230e9 100644 (file)
--- a/slcan_attach.c
+++ b/slcan_attach.c
@@ -51,8 +51,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#include <termios.h>
 
 #define LDISC_N_SLCAN 17 /* default slcan line discipline since Kernel 2.6.25 */
 

diff --git a/slcand.c b/slcand.c
index 334c718dafe52e445782d98dc2c5918c4b72b324..2642405a595e960b9d044a76cf16ce6b90f9c1da 100644 (file)
--- a/slcand.c
+++ b/slcand.c
@@ -44,14 +44,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <syslog.h>
 #include <errno.h>
 #include <pwd.h>
 #include <signal.h>
+#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <net/if.h>
 
 /* default slcan line discipline since Kernel 2.6.25 */

diff --git a/slcanpty.c b/slcanpty.c
index ada6f3bc68b679be62796fd1062f8aaf7402583b..67dcf35ee5c14ab511528c4701065ff5efdb8cbd 100644 (file)
--- a/slcanpty.c
+++ b/slcanpty.c
@@ -34,6 +34,7 @@
 #include <termios.h>
 
 #include <net/if.h>
+#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>