small rework of macro processing code
use macros MTOK.. for internal buffer manipulation
correct prototypes