fixing up compiler macros - sheesh - someday i will get this right