Commit c228296

@@ -64,15 +64,15 @@
 #endif
 
 /* Macro trickery */
-#define EMPTY()
+#define MACRO_EMPTY()
 
-#define DEFER( macro ) macro EMPTY()
-#define OBSTRUCT( ... ) __VA_ARGS__ DEFER( EMPTY )()
-#define EXPAND( ... ) __VA_ARGS__
+#define MACRO_DEFER( macro ) macro MACRO_EMPTY()
+#define MACRO_OBSTRUCT( ... ) __VA_ARGS__ MACRO_DEFER( MACRO_EMPTY )()
+#define MACRO_EXPAND( ... ) __VA_ARGS__
 
-#define STRING_JOIN( str1, str2 ) str1##str2
+#define MACRO_STRING_JOIN( str1, str2 ) str1##str2
 
-#define UNIQUE_NAME( name ) EXPAND(DEFER(STRING_JOIN)(name, __LINE__))
+#define UNIQUE_NAME( name ) MACRO_EXPAND(MACRO_DEFER(MACRO_STRING_JOIN)(name, __LINE__))
 
 /* Warnings and errors */