changed macro.c|h to conform to some standards