Merge: The inttypes.h file is now standard, use it where appropriate.

Merge commit 'remotes/sf-ocera-lincan/master'

diff --git a/lincan/include/can.h b/lincan/include/can.h
index b3b265ce141c7eb96e47a4e56cafe06c73346ccc..8ff57ea558fcb1461eec9df2b6017fe7d503176c 100644 (file)
--- a/lincan/include/can.h
+++ b/lincan/include/can.h
@@ -18,6 +18,7 @@
 
 #else /* __KERNEL__ */
 
+#include <inttypes.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>

diff --git a/lincan/include/canmsg.h b/lincan/include/canmsg.h
index 779f68c52c3fc23026cba058d1919084f3d3c63e..0738fc9bdc4adbfcc1ecbf999529500c6c7d8b6b 100644 (file)
--- a/lincan/include/canmsg.h
+++ b/lincan/include/canmsg.h
@@ -16,6 +16,7 @@
 
 #else /* __KERNEL__ */
 
+#include <inttypes.h>
 #include <sys/time.h>
 #include <sys/types.h>