raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Dave Stevenson
2018-09-24 16:21:06 +01:00
committed by Phil Elwell
parent 60b761a9fa
commit 84b1533a86
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/vc04_services/bcm2835-camera/mmal-common.h
View File

@@ -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 {
u32 u; u32 u;
u32 v; u32 v;
}; };
#endif

3
drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
View File

@@ -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 {
u8 payload[MMAL_MSG_MAX_PAYLOAD]; u8 payload[MMAL_MSG_MAX_PAYLOAD];
} u; } u;
}; };
#endif