Formerly variable.c.~24~

diff --git a/variable.c b/variable.c
index 2f104acd4e99fc619dc44fc11e624c0b4e8a2879..59811a1c61703caee6dbb67c4c8fbb8440ce9fd7 100644 (file)
--- a/variable.c
+++ b/variable.c
@@ -446,7 +446,6 @@ target_environment (file)
          register struct variable *v;
          for (v = set->table[i]; v != 0; v = v->next)
            {
-             extern char *getenv ();
              unsigned int j = i % buckets;
              register struct variable_bucket *ov;
              register char *p = v->name;
@@ -464,10 +463,9 @@ target_environment (file)
                    /* Only export default variables by explicit request.  */
                    continue;
 
-                 if (!export_all_variables
+                 if (! export_all_variables
                      && v->origin != o_command
-                     && v->origin != o_env && v->origin != o_env_override
-                     && !(v->origin == o_file && getenv (p) != 0))
+                     && v->origin != o_env && v->origin != o_env_override)
                    continue;
 
                  if (*p != '_' && (*p < 'A' || *p > 'Z')