Merge r1213567: Explicitly cast function pointer, to remove 'const'. Hopefully this makes the NetWare compiler happy.