Index: src/macros.h ================================================================== --- src/macros.h +++ src/macros.h @@ -339,16 +339,18 @@ abort(); \ \ [super dealloc]; /* Get rid of a stupid warning */ #endif +#define OF_PREPROCESSOR_CONCAT2(a, b) a##b +#define OF_PREPROCESSOR_CONCAT(a, b) OF_PREPROCESSOR_CONCAT2(a, b) #define OF_CONSTRUCTOR(prio) \ static void __attribute__((__constructor__(prio))) \ - constructor##__LINE__(void) + OF_PREPROCESSOR_CONCAT(constructor, __LINE__)(void) #define OF_DESTRUCTOR(prio) \ static void __attribute__((__destructor__(prio))) \ - destructor##__LINE__(void) + OF_PREPROCESSOR_CONCAT(destructor, __LINE__)(void) static OF_INLINE uint16_t OF_CONST_FUNC OF_BSWAP16_CONST(uint16_t i) { return (i & UINT16_C(0xFF00)) >> 8 |