llvm 2.5: Updated patch to include preprocessor definitions.