diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2014-05-15 22:31:56 +0400 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-05-19 11:38:24 +0400 |
| commit | 42193e3efb632c84d686acacd7b2327f2b1f8c63 (patch) | |
| tree | 64b169d00c4c2f02b61f08aeedbc1ca4a9f18f0f /include/uapi/linux/can.h | |
| parent | fd1159318e55e901cf269de90163b19fd62938cb (diff) | |
| download | linux-42193e3efb632c84d686acacd7b2327f2b1f8c63.tar.xz | |
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>
Diffstat (limited to 'include/uapi/linux/can.h')
| -rw-r--r-- | include/uapi/linux/can.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h index 5d9d1d140718..41892f720057 100644 --- a/include/uapi/linux/can.h +++ b/include/uapi/linux/can.h @@ -42,8 +42,8 @@ * DAMAGE. */ -#ifndef CAN_H -#define CAN_H +#ifndef _UAPI_CAN_H +#define _UAPI_CAN_H #include <linux/types.h> #include <linux/socket.h> @@ -191,4 +191,4 @@ struct can_filter { #define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */ -#endif /* CAN_H */ +#endif /* !_UAPI_CAN_H */ |