can: Merge netpacket/can.h into nuttx/can.h
This patch is associated with 'https://github.com/apache/nuttx/pull/13048', so it cannot be verified separately by CI. Please help to associate and review it. Thank you! Signed-off-by: gaohedong <gaohedong@xiaomi.com>
This commit is contained in:
parent
89dd0c29e2
commit
481d4b6e23
@ -62,7 +62,6 @@
|
||||
#include <net/if.h>
|
||||
|
||||
#include <nuttx/can.h>
|
||||
#include <netpacket/can.h>
|
||||
|
||||
#include "terminal.h"
|
||||
#include "lib.h"
|
||||
|
@ -77,7 +77,6 @@
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <nuttx/can.h>
|
||||
#include <netpacket/can.h>
|
||||
|
||||
#include "lib.h"
|
||||
|
||||
|
@ -55,7 +55,6 @@ index 4fc133dd..b059c849 100644
|
||||
|
||||
+#ifdef __NuttX__
|
||||
+#include <nuttx/can.h>
|
||||
+#include <netpacket/can.h>
|
||||
+#endif
|
||||
+
|
||||
int
|
||||
@ -99,7 +98,6 @@ index ca7e7d95..35d9a9f2 100644
|
||||
+#ifdef __NuttX__
|
||||
+#include <sys/ioctl.h>
|
||||
+#include <nuttx/can.h>
|
||||
+#include <netpacket/can.h>
|
||||
+#include <net/if.h>
|
||||
+#endif
|
||||
+
|
||||
|
@ -49,7 +49,6 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/socket.h> /* for sa_family_t */
|
||||
#include <nuttx/can.h>
|
||||
#include <netpacket/can.h>
|
||||
|
||||
#include "lib.h"
|
||||
|
||||
|
@ -47,7 +47,6 @@
|
||||
#include <net/if.h>
|
||||
#include <termios.h>
|
||||
#include <nuttx/can.h>
|
||||
#include <netpacket/can.h>
|
||||
|
||||
#include "slcan.h"
|
||||
|
||||
|
@ -43,7 +43,6 @@
|
||||
#include <poll.h>
|
||||
|
||||
#include <nuttx/can.h>
|
||||
#include <netpacket/can.h>
|
||||
|
||||
#include "socketcan.h"
|
||||
|
||||
|
@ -33,7 +33,6 @@
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <nuttx/can.h>
|
||||
#include <netpacket/can.h>
|
||||
|
||||
#include <canard.h>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user