ce423c9e98
Source changes for older compilers plus makefile changes. Reviewed-by: xlu
Source changes for older compilers plus makefile changes. Reviewed-by: xlu