clear up and fix macro bug in sish.h