pw_log_tokenized: Fix macro definition for C
Move internal macro definitions so they are defined in both C and C++.
Change-Id: I4e0ff3a69d48a011198b5d5a33faf71721dd3315
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/15022
Reviewed-by: Armando Montanez <amontanez@google.com>
Commit-Queue: Armando Montanez <amontanez@google.com>
Commit-Queue: Wyatt Hepler <hepler@google.com>
diff --git a/pw_log_tokenized/public/pw_log_tokenized/log_tokenized.h b/pw_log_tokenized/public/pw_log_tokenized/log_tokenized.h
index 1f67ce1..b08c81a 100644
--- a/pw_log_tokenized/public/pw_log_tokenized/log_tokenized.h
+++ b/pw_log_tokenized/public/pw_log_tokenized/log_tokenized.h
@@ -50,8 +50,19 @@
#define PW_LOG_TOKENIZED_FORMAT_STRING(string) PW_LOG_MODULE_NAME ": " string
#endif // PW_LOG_TOKENIZED_FORMAT_STRING
+// The log level, module token, and flag bits are packed into the tokenizer's
+// payload argument, which is typically 32 bits. These macros specify the number
+// of bits to use for each field.
+#define _PW_LOG_TOKENIZED_LEVEL_BITS 6
+#define _PW_LOG_TOKENIZED_MODULE_BITS 16
+#define _PW_LOG_TOKENIZED_FLAG_BITS 10
+
#ifdef __cplusplus
+static_assert((_PW_LOG_TOKENIZED_LEVEL_BITS + _PW_LOG_TOKENIZED_MODULE_BITS +
+ _PW_LOG_TOKENIZED_FLAG_BITS) == 32,
+ "Log metadata must fit in a 32-bit integer");
+
namespace pw {
namespace log_tokenized {
namespace internal {
@@ -100,17 +111,6 @@
static_assert(level_bits + module_bits + flag_bits <= sizeof(bits_) * 8);
};
-// The log level, module token, and flag bits are packed into the tokenizer's
-// payload argument, which is typically 32 bits. These macros specify the number
-// of bits to use for each field.
-#define _PW_LOG_TOKENIZED_LEVEL_BITS 6
-#define _PW_LOG_TOKENIZED_MODULE_BITS 16
-#define _PW_LOG_TOKENIZED_FLAG_BITS 10
-
-static_assert((_PW_LOG_TOKENIZED_LEVEL_BITS + _PW_LOG_TOKENIZED_MODULE_BITS +
- _PW_LOG_TOKENIZED_FLAG_BITS) == 32,
- "Log metadata must fit in a 32-bit integer");
-
} // namespace internal
using Metadata = internal::GenericMetadata<_PW_LOG_TOKENIZED_LEVEL_BITS,
