OSDN Git Service

Merge "Undef before redefining macros" am: 028c26c2d0 am: 46fbc9c701