diff options
Diffstat (limited to 'lib/Target/CBackend/CBackend.cpp')
| -rw-r--r-- | lib/Target/CBackend/CBackend.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index a12afa7958..954266163b 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -435,7 +435,9 @@ void CWriter::printConstant(Constant *CPV) { case Type::PointerTyID: if (isa<ConstantPointerNull>(CPV)) { - Out << "(NULL)"; + Out << "(("; + printType(Out, CPV->getType()); + Out << ")/*NULL*/0)"; break; } else if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(CPV)) { writeOperand(CPR->getValue()); @@ -545,9 +547,8 @@ void CWriter::printModule(Module *M) { Out << "#include <stdarg.h>\n"; Out << "#include <setjmp.h>\n"; - // Provide a definition for null if one does not already exist, - // and for `bool' if not compiling with a C++ compiler. - Out << "#ifndef NULL\n#define NULL 0\n#endif\n\n" + // Provide a definition for `bool' if not compiling with a C++ compiler. + Out << "\n" << "#ifndef __cplusplus\ntypedef unsigned char bool;\n#endif\n" << "\n\n/* Support for floating point constants */\n" |