From cc6d019a9313a1a321c025a8d65ca895494e15ab Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 16 May 2018 14:55:17 +0200 Subject: [PATCH] fix(enum-generator): expand correctly L_DECLARE_ENUM_MACRO_CHOOSER and L_DECLARE_ENUM_VALUE on Windows --- include/linphone/utils/enum-generator.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linphone/utils/enum-generator.h b/include/linphone/utils/enum-generator.h index f66000791..ebdca6c61 100644 --- a/include/linphone/utils/enum-generator.h +++ b/include/linphone/utils/enum-generator.h @@ -37,10 +37,11 @@ LINPHONE_BEGIN_NAMESPACE // Call the right macro. (With or without value.) #define L_DECLARE_ENUM_MACRO_CHOOSER(...) \ - L_GET_ARG_3(__VA_ARGS__, L_DECLARE_ENUM_VALUE_2_ARGS, L_DECLARE_ENUM_VALUE_1_ARG) + L_EXPAND(L_GET_ARG_3(__VA_ARGS__, L_DECLARE_ENUM_VALUE_2_ARGS, L_DECLARE_ENUM_VALUE_1_ARG)) // Enum value declaration. -#define L_DECLARE_ENUM_VALUE(...) L_DECLARE_ENUM_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__) +#define L_DECLARE_ENUM_VALUE(...) \ + L_EXPAND(L_DECLARE_ENUM_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)) #ifdef __cplusplus