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>
This commit is contained in:
Yegor Yefremov
2012-03-20 11:16:43 +01:00
committed by Marc Kleine-Budde
parent 5077515927
commit 4d3a002ec1
6 changed files with 9 additions and 3 deletions
+1 -1
View File
@@ -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"
+1
View File
@@ -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>
+1
View File
@@ -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>
+2
View File
@@ -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 */
+3 -2
View File
@@ -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 */
+1
View File
@@ -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>