From 93bf752f2df7845067b6d1b74ac1a5bb6346afae Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Sun, 14 Jul 2019 13:30:12 +0100 Subject: [PATCH] Fix -Wundef warnings --- interface/vchi/vchi_cfg.h | 4 ++-- interface/vmcs_host/vc_dispmanx_types.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/vchi/vchi_cfg.h b/interface/vchi/vchi_cfg.h index d179f8a87..198168d0c 100644 --- a/interface/vchi/vchi_cfg.h +++ b/interface/vchi/vchi_cfg.h @@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* Required alignment of base addresses for bulk transfer, if unaligned transfers are not enabled */ /* Really determined by the message driver, and should be available from a run-time call. */ #ifndef VCHI_BULK_ALIGN -# if __VCCOREVER__ >= 0x04000000 +# if defined(__VCCOREVER__) && __VCCOREVER__ >= 0x04000000 # define VCHI_BULK_ALIGN 32 // Allows for the need to do cache cleans # else # define VCHI_BULK_ALIGN 16 @@ -51,7 +51,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* May be less than or greater than VCHI_BULK_ALIGN */ /* Really determined by the message driver, and should be available from a run-time call. */ #ifndef VCHI_BULK_GRANULARITY -# if __VCCOREVER__ >= 0x04000000 +# if defined(__VCCOREVER__) && __VCCOREVER__ >= 0x04000000 # define VCHI_BULK_GRANULARITY 32 // Allows for the need to do cache cleans # else # define VCHI_BULK_GRANULARITY 16 diff --git a/interface/vmcs_host/vc_dispmanx_types.h b/interface/vmcs_host/vc_dispmanx_types.h index 804f716d1..aaf110e63 100644 --- a/interface/vmcs_host/vc_dispmanx_types.h +++ b/interface/vmcs_host/vc_dispmanx_types.h @@ -124,7 +124,7 @@ typedef struct { typedef enum { DISPMANX_FLAGS_CLAMP_NONE = 0, DISPMANX_FLAGS_CLAMP_LUMA_TRANSPARENT = 1, -#if __VCCOREVER__ >= 0x04000000 +#if defined(__VCCOREVER__) && __VCCOREVER__ >= 0x04000000 DISPMANX_FLAGS_CLAMP_TRANSPARENT = 2, DISPMANX_FLAGS_CLAMP_REPLACE = 3 #else