--- src/usr.bin/make/arch.c 2005/08/03 23:20:35 1.54 +++ src/usr.bin/make/arch.c 2005/09/24 07:37:01 1.55 @@ -224,7 +224,7 @@ Arch_ParseArchive(char **linePtr, Lst *n subLibName = false; - for (cp = libName; *cp != '(' && *cp != '\0'; cp++) { + for (cp = libName; *cp != OPEN_PAREN && *cp != '\0'; cp++) { if (*cp == '$') { /* * Variable spec, so call the Var module to parse the @@ -264,13 +264,13 @@ Arch_ParseArchive(char **linePtr, Lst *n */ bool doSubst = false; - while (*cp != '\0' && *cp != ')' && + while (*cp != '\0' && *cp != CLOSE_PAREN && isspace((unsigned char)*cp)) { cp++; } memName = cp; - while (*cp != '\0' && *cp != ')' && + while (*cp != '\0' && *cp != CLOSE_PAREN && !isspace((unsigned char)*cp)) { if (*cp == '$') { /* @@ -463,7 +463,7 @@ Arch_ParseArchive(char **linePtr, Lst *n /* * We promised the pointer would be set up at the next non-space, so * we must advance cp there before setting *linePtr... (note that on - * entrance to the loop, cp is guaranteed to point at a ')') + * entrance to the loop, cp is guaranteed to point at a CLOSE_PAREN) */ do { cp++; @@ -1098,8 +1098,8 @@ Arch_MemMTime(GNode *gn) * parents in case some other parent requires this * child to exist... */ - nameStart = strchr(pgn->name, '(') + 1; - nameEnd = strchr(nameStart, ')'); + nameStart = strchr(pgn->name, OPEN_PAREN) + 1; + nameEnd = strchr(nameStart, CLOSE_PAREN); if (pgn->make && strncmp(nameStart, gn->name, nameEnd - nameStart) == 0) {