You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From c37e8c9137e4858ed86e211f3fddbb9d9af08532 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Mon, 24 Sep 2018 16:21:06 +0100
|
|
Subject: [PATCH 255/806] 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: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/staging/vc04_services/bcm2835-camera/mmal-common.h | 3 +++
|
|
drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h | 3 +++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-common.h
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-common.h
|
|
@@ -13,6 +13,8 @@
|
|
* 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_MAGIC MMAL_FOURCC('m', 'm', 'a', 'l')
|
|
@@ -56,3 +58,4 @@ struct mmal_colourfx {
|
|
u32 u;
|
|
u32 v;
|
|
};
|
|
+#endif
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
|
|
@@ -23,6 +23,8 @@
|
|
* implementation uses fixed size types and not the enums (though the
|
|
* comments have the actual enum type
|
|
*/
|
|
+#ifndef MMAL_MSG_H
|
|
+#define MMAL_MSG_H
|
|
|
|
#define VC_MMAL_VER 15
|
|
#define VC_MMAL_MIN_VER 10
|
|
@@ -401,3 +403,4 @@ struct mmal_msg {
|
|
u8 payload[MMAL_MSG_MAX_PAYLOAD];
|
|
} u;
|
|
};
|
|
+#endif
|