Commit 807855ca authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman

staging: bcm2835-camera: Add multiple inclusion protection to headers

mmal-common.h and mmal-msg.h didn't have the normal
ifndef FOO / define FOO / endif protection to stop it being
included multiple times. Add it.
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent abb4718c
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
* MMAL structures * MMAL structures
* *
*/ */
#ifndef MMAL_COMMON_H
#define MMAL_COMMON_H
#define MMAL_FOURCC(a, b, c, d) ((a) | (b << 8) | (c << 16) | (d << 24)) #define MMAL_FOURCC(a, b, c, d) ((a) | (b << 8) | (c << 16) | (d << 24))
#define MMAL_MAGIC MMAL_FOURCC('m', 'm', 'a', 'l') #define MMAL_MAGIC MMAL_FOURCC('m', 'm', 'a', 'l')
...@@ -56,3 +58,4 @@ struct mmal_colourfx { ...@@ -56,3 +58,4 @@ struct mmal_colourfx {
u32 u; u32 u;
u32 v; u32 v;
}; };
#endif
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* implementation uses fixed size types and not the enums (though the * implementation uses fixed size types and not the enums (though the
* comments have the actual enum type * comments have the actual enum type
*/ */
#ifndef MMAL_MSG_H
#define MMAL_MSG_H
#define VC_MMAL_VER 15 #define VC_MMAL_VER 15
#define VC_MMAL_MIN_VER 10 #define VC_MMAL_MIN_VER 10
...@@ -401,3 +403,4 @@ struct mmal_msg { ...@@ -401,3 +403,4 @@ struct mmal_msg {
u8 payload[MMAL_MSG_MAX_PAYLOAD]; u8 payload[MMAL_MSG_MAX_PAYLOAD];
} u; } u;
}; };
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment