From ce65c54d7a61947ee7b566dc8e7cca9fbc30da2c Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 10 Sep 2002 15:39:18 -0400 Subject: ERR: Fixes for comeau compiler. NULL is a pointer of type void*, and cannot be compared directly with other pointer types. We use 0 instead. --- Source/cmCPluginAPI.cxx | 2 +- Source/cmLoadCommandCommand.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx index b141160..6fb744e 100644 --- a/Source/cmCPluginAPI.cxx +++ b/Source/cmCPluginAPI.cxx @@ -312,7 +312,7 @@ void cmExpandSourceListArguments(void *arg, } mf->ExpandSourceListArguments(args2, result, startArgumentIndex); int resargc = static_cast(result.size()); - char **resargv = NULL; + char **resargv = 0; if (resargc) { resargv = (char **)malloc(resargc*sizeof(char *)); diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 16e16ee..3c098f5 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -114,7 +114,7 @@ bool cmLoadedCommand::InitialPass(std::vector const& args) // create argc and argv and then invoke the command int argc = static_cast (args.size()); - char **argv = NULL; + char **argv = 0; if (argc) { argv = (char **)malloc(argc*sizeof(char *)); -- cgit v0.12