changed to macros

Original commit message from CVS:
changed to macros
1 file changed