use idiomatic safe form for FUNLOCK macro

use idiomatic safe form for FUNLOCK macro

previously this macro used an odd if/else form instead of the more
idiomatic do/while(0), making it unsafe against omission of trailing
semicolon. the omission would make the following statement conditional
instead of producing an error.