fixed multiple build problems when WITH_OSL is undefined; fixed coding style issues.