summaryrefslogtreecommitdiff
path: root/src/rule.c
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2020-01-03 18:19:33 -0500
committerPaul Smith <psmith@gnu.org>2020-01-04 13:23:23 -0500
commitb774aebffadd5f8374ff435b4c5d660ee899add7 (patch)
treec57832e89a23bedd0c791646d424e0a5cb513e7e /src/rule.c
parent06de697268492b72297b02ef69f68becc1874b54 (diff)
downloadmake-git-b774aebffadd5f8374ff435b4c5d660ee899add7.tar.gz
Enable compilation with C90 compilers
* configure.ac: Try compiling Guile headers: they don't work with C90. * maintMakefile: Simplify config checks via target-specific variables. * src/makeint.h: Use ATTRIBUTE rather than defining __attribute__, as that causes compile issues with system headers. (ENUM_BITFIELD): Don't use enum bitfields in ANSI mode. * src/main.c: Use ATTRIBUTE instead of __attribute__. * src/job.h: Ditto. * src/file.c: Don't define variables inside for loops. * src/rule.c: Ditto. * src/dep.h (SI): Only use static inline in non-ANSI mode.
Diffstat (limited to 'src/rule.c')
-rw-r--r--src/rule.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rule.c b/src/rule.c
index 358ec56f..f4c11790 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -71,14 +71,16 @@ snap_implicit_rules (void)
{
char *name = NULL;
size_t namelen = 0;
+ struct rule *rule;
+ struct dep *dep;
struct dep *prereqs = expand_extra_prereqs (lookup_variable (STRING_SIZE_TUPLE(".EXTRA_PREREQS")));
unsigned int pre_deps = 0;
max_pattern_dep_length = 0;
- for (struct dep *d = prereqs; d; d = d->next)
+ for (dep = prereqs; dep; dep = dep->next)
{
- size_t l = strlen (dep_name (d));
+ size_t l = strlen (dep_name (dep));
if (l > max_pattern_dep_length)
max_pattern_dep_length = l;
++pre_deps;
@@ -86,7 +88,7 @@ snap_implicit_rules (void)
num_pattern_rules = max_pattern_targets = max_pattern_deps = 0;
- for (struct rule *rule = pattern_rules; rule; rule = rule->next)
+ for (rule = pattern_rules; rule; rule = rule->next)
{
unsigned int ndeps = pre_deps;
struct dep *lastdep = NULL;
@@ -96,7 +98,7 @@ snap_implicit_rules (void)
if (rule->num > max_pattern_targets)
max_pattern_targets = rule->num;
- for (struct dep *dep = rule->deps; dep != 0; dep = dep->next)
+ for (dep = rule->deps; dep != 0; dep = dep->next)
{
const char *dname = dep_name (dep);
size_t len = strlen (dname);