Fix SF bug [ #476852 ] Some bad macros in abstract.h

Change macros as requested by Guido
1 file changed