From 853dd82f0f73e9a062cd8b208e5caebcbf80f95b Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Thu, 18 Jul 2013 14:36:39 -0400 Subject: [PATCH] Bug 895322 - Part 4: Only use MOZ_STATIC_ASSERT in mar.h when we're compiling C code; r=Waldo --HG-- extra : rebase_source : 9180550b66311f339e9ea46546aa75cab3d8c92b --- modules/libmar/src/mar.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/libmar/src/mar.h b/modules/libmar/src/mar.h index e8666c674942..4e53d2cb5bd3 100644 --- a/modules/libmar/src/mar.h +++ b/modules/libmar/src/mar.h @@ -21,7 +21,11 @@ extern "C" { * code in tool/mar.c. */ #define MAX_SIGNATURES 8 +#ifdef __cplusplus +static_assert(MAX_SIGNATURES <= 9, "too many signatures"); +#else MOZ_STATIC_ASSERT(MAX_SIGNATURES <= 9, "too many signatures"); +#endif struct ProductInformationBlock { const char *MARChannelID;