[BACK]Return to var.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/var.c between version 1.81 and 1.82

version 1.81, 2007/11/03 15:42:10 version 1.82, 2007/11/04 09:31:57
Line 560 
Line 560 
   
         v = find_global_var_without_env(name, ename, k);          v = find_global_var_without_env(name, ename, k);
   
         if ((v->flags & VAR_SEEN_ENV) == 0 &&          if ((v->flags & VAR_SEEN_ENV) == 0)
             (checkEnvFirst  && (v->flags & VAR_FROM_CMD) == 0 ||                  if ((checkEnvFirst && (v->flags & VAR_FROM_CMD) == 0) ||
                 (v->flags & VAR_DUMMY) != 0))                      (v->flags & VAR_DUMMY) != 0)
                     fill_from_env(v);                          fill_from_env(v);
   
         return v;          return v;
 }  }

Legend:
Removed from v.1.81  
changed lines
  Added in v.1.82