merge r827846 from apr trunk: remove dangling ";" after function body to resolve "warning: syntax error: empty declaration" from SunStudio