Index: src/OFColor.m ================================================================== --- src/OFColor.m +++ src/OFColor.m @@ -23,27 +23,27 @@ #import "OFInvalidArgumentException.h" @implementation OFColor #define PREDEFINED_COLOR(name, r, g, b) \ - static OFColor *name = nil; \ + static OFColor *name##Color = nil; \ \ static void \ initPredefinedColor_##name(void) \ { \ - name = [[OFColor alloc] initWithRed: r \ - green: g \ - blue: b \ - alpha: 1]; \ + name##Color = [[OFColor alloc] initWithRed: r \ + green: g \ + blue: b \ + alpha: 1]; \ } \ \ + (OFColor *)name \ { \ static of_once_t onceControl = OF_ONCE_INIT; \ of_once(&onceControl, initPredefinedColor_##name); \ \ - return name; \ + return name##Color; \ } PREDEFINED_COLOR(black, 0.00, 0.00, 0.00) PREDEFINED_COLOR(silver, 0.75, 0.75, 0.75) PREDEFINED_COLOR(grey, 0.50, 0.50, 0.50)