can: unify identifiers to ensure unique include processing
Armin pointed me to the fact that the identifier which is used to ensure the unique include processing in lunux/include/uapi/linux/can.h is CAN_H. This clashed with his own source as includes from libraries and APIs should use an underscore '_' at the identifier start. This patch fixes the protection identifiers in all CAN relavant includes. Reported-by: Armin Burchardt <armin@uni-bremen.de> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:

committed by
Marc Kleine-Budde

parent
fd1159318e
commit
42193e3efb
@@ -41,8 +41,8 @@
|
||||
* DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef CAN_BCM_H
|
||||
#define CAN_BCM_H
|
||||
#ifndef _UAPI_CAN_BCM_H
|
||||
#define _UAPI_CAN_BCM_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/can.h>
|
||||
@@ -95,4 +95,4 @@ enum {
|
||||
#define TX_RESET_MULTI_IDX 0x0200
|
||||
#define RX_RTR_FRAME 0x0400
|
||||
|
||||
#endif /* CAN_BCM_H */
|
||||
#endif /* !_UAPI_CAN_BCM_H */
|
||||
|
@@ -41,8 +41,8 @@
|
||||
* DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef CAN_ERROR_H
|
||||
#define CAN_ERROR_H
|
||||
#ifndef _UAPI_CAN_ERROR_H
|
||||
#define _UAPI_CAN_ERROR_H
|
||||
|
||||
#define CAN_ERR_DLC 8 /* dlc for error message frames */
|
||||
|
||||
@@ -120,4 +120,4 @@
|
||||
|
||||
/* controller specific additional information / data[5..7] */
|
||||
|
||||
#endif /* CAN_ERROR_H */
|
||||
#endif /* _UAPI_CAN_ERROR_H */
|
||||
|
@@ -41,8 +41,8 @@
|
||||
* DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef CAN_GW_H
|
||||
#define CAN_GW_H
|
||||
#ifndef _UAPI_CAN_GW_H
|
||||
#define _UAPI_CAN_GW_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/can.h>
|
||||
@@ -200,4 +200,4 @@ enum {
|
||||
* Beware of sending unpacked or aligned structs!
|
||||
*/
|
||||
|
||||
#endif
|
||||
#endif /* !_UAPI_CAN_GW_H */
|
||||
|
@@ -15,8 +15,8 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef CAN_NETLINK_H
|
||||
#define CAN_NETLINK_H
|
||||
#ifndef _UAPI_CAN_NETLINK_H
|
||||
#define _UAPI_CAN_NETLINK_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
@@ -130,4 +130,4 @@ enum {
|
||||
|
||||
#define IFLA_CAN_MAX (__IFLA_CAN_MAX - 1)
|
||||
|
||||
#endif /* CAN_NETLINK_H */
|
||||
#endif /* !_UAPI_CAN_NETLINK_H */
|
||||
|
@@ -42,8 +42,8 @@
|
||||
* DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef CAN_RAW_H
|
||||
#define CAN_RAW_H
|
||||
#ifndef _UAPI_CAN_RAW_H
|
||||
#define _UAPI_CAN_RAW_H
|
||||
|
||||
#include <linux/can.h>
|
||||
|
||||
@@ -59,4 +59,4 @@ enum {
|
||||
CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif /* !_UAPI_CAN_RAW_H */
|
||||
|
Reference in New Issue
Block a user