2cb1c6 Finally the macro ain't so bad to read and removes duplicated code

Authored and Committed by Pierre-Yves Chibon 9 years ago
    Finally the macro ain't so bad to read and removes duplicated code