Remove the #ifdef's for NISPLUS_SAM - there are no function name collisions anymore