From 5c58feab7bbf55ffec35df2c5f82f0d288a3c987 Mon Sep 17 00:00:00 2001 From: Chris Kuhn Date: Wed, 8 Mar 2023 03:47:45 +0100 Subject: conf, passt: Rename stderr to force_stderr While building against musl, gcc informs us that 'stderr' is a protected keyword. This probably comes from a #define stderr (stderr) in musl's stdio.h, to avoid a clash with extern FILE *const stderr, but I didn't really track it down. Just rename it to force_stderr, it makes more sense. [sbrivio: Added commit message] Signed-off-by: Stefano Brivio Reviewed-by: David Gibson --- conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf.c') diff --git a/conf.c b/conf.c index e2a7d68..4d23804 100644 --- a/conf.c +++ b/conf.c @@ -1357,13 +1357,13 @@ void conf(struct ctx *c, int argc, char **argv) if (logfile) die("Can't log to both file and stderr"); - if (c->stderr) + if (c->force_stderr) die("Multiple --stderr options given"); - c->stderr = 1; + c->force_stderr = 1; break; case 'l': - if (c->stderr) + if (c->force_stderr) die("Can't log to both stderr and file"); if (logfile) -- cgit v1.2.3