github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-01 07:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

* src/rule.c (get_rule_defn): Don't use STRING_SIZE_TUPLE in mempcpy

Browse Source 
If mempcpy() is a macro then STRING_SIZE_TUPLE won't compile.
This commit is contained in:
Paul Smith 2022-10-23 14:00:08 -04:00
parent c46b5a9e0e
commit 6f8da5f4b8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/makeint.h
View File

@ -495,6 +495,8 @@ extern struct rlimit stack_limit;
/* Number of characters in a string constant. Does NOT include the \0 byte. */
#define CSTRLEN(_s) (sizeof (_s)-1)
/* Only usable when NOT calling a macro: only use it for local functions. */
#define STRING_SIZE_TUPLE(_s) (_s), CSTRLEN(_s)
/* The number of bytes needed to represent the largest signed and unsigned

4
src/rule.c
View File

@ -94,7 +94,7 @@ get_rule_defn (struct rule *r)
if (dep->ignore_mtime == 0)
{
if (dep->wait_here)
p = mempcpy (p, STRING_SIZE_TUPLE (" .WAIT"));
p = mempcpy (p, " .WAIT", CSTRLEN (" .WAIT"));
p = mempcpy (mempcpy (p, " ", 1), dep_name (dep),
strlen (dep_name (dep)));
}
@ -107,7 +107,7 @@ get_rule_defn (struct rule *r)
{
p = mempcpy (p, sep, strlen (sep));
if (ood->wait_here)
p = mempcpy (p, STRING_SIZE_TUPLE (".WAIT "));
p = mempcpy (p, ".WAIT ", CSTRLEN (".WAIT "));
p = mempcpy (p, dep_name (ood), strlen (dep_name (ood)));
}
*p = '\0';