From b916407a2a06f8452e82b74dc44c54acbcc572b0 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:27:42 +0200 Subject: 5.21 --- zen/warn_static.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'zen/warn_static.h') diff --git a/zen/warn_static.h b/zen/warn_static.h index 737a56fb..b9673ed6 100644 --- a/zen/warn_static.h +++ b/zen/warn_static.h @@ -15,19 +15,19 @@ Usage: */ #ifdef _MSC_VER -#define MAKE_STRING_SUB(NUM) #NUM -#define MAKE_STRING(NUM) MAKE_STRING_SUB(NUM) +#define STATIC_WARNING_MAKE_STRINGIZE_SUB(NUM) #NUM +#define STATIC_WARNING_MAKE_STRINGIZE(NUM) STATIC_WARNING_MAKE_STRINGIZE_SUB(NUM) #define warn_static(TXT) \ - __pragma(message (__FILE__ "(" MAKE_STRING(__LINE__) "): Warning: " ## TXT)) + __pragma(message (__FILE__ "(" STATIC_WARNING_MAKE_STRINGIZE(__LINE__) "): Warning: " ## TXT)) #elif defined __GNUC__ -#define ZEN_CONCAT_SUB(X, Y) X ## Y -#define ZEN_CONCAT(X, Y) ZEN_CONCAT_SUB(X, Y) +#define STATIC_WARNING_CONCAT_SUB(X, Y) X ## Y +#define STATIC_WARNING_CONCAT(X, Y) STATIC_WARNING_CONCAT_SUB(X, Y) #define warn_static(TXT) \ typedef int STATIC_WARNING_87903124 __attribute__ ((deprecated)); \ - enum { ZEN_CONCAT(warn_static_dummy_value, __LINE__) = sizeof(STATIC_WARNING_87903124) }; + enum { STATIC_WARNING_CONCAT(warn_static_dummy_value, __LINE__) = sizeof(STATIC_WARNING_87903124) }; #endif #endif //WARN_STATIC_HEADER_08724567834560832745 -- cgit