version 1.95, 2007/09/23 09:47:56 |
version 1.96, 2009/05/10 11:52:09 |
|
|
if (*cp == '\0') { |
if (*cp == '\0') { |
/* Ending a dependency line without an operator is a |
/* Ending a dependency line without an operator is a |
* Bozo no-no */ |
* Bozo no-no */ |
Parse_Error(PARSE_FATAL, "Need an operator"); |
/* Deeper check for cvs conflicts */ |
|
if (gtargets.n > 0 && |
|
(strcmp(gtargets.a[0]->name, "<<<<<<<") == 0 || |
|
strcmp(gtargets.a[0]->name, ">>>>>>>") == 0)) { |
|
Parse_Error(PARSE_FATAL, |
|
"Need an operator (likely from a cvs update conflict)"); |
|
} else { |
|
Parse_Error(PARSE_FATAL, "Need an operator"); |
|
} |
return NULL; |
return NULL; |
} |
} |
/* |
/* |