Commit cec3569f250379aaa9aa4cec4fb49d4a78d6ee11

Fallso 2015-07-14T15:33:56

Fix macro redefinition warning