b754643 Update to new macros

Authored and Committed by eclipseo 4 years ago
    Update to new macros
    
    Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>