mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Merge remote-tracking branch 'origin/master' into backport

Browse Source
This commit is contained in:
Maria Matejka
2022-07-11 11:08:10 +02:00
parent d429bc5c84 cb339a3067
commit 2e5bfeb73a
20 changed files with 789 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysdep/unix/main.c
View File

@@ -116,7 +116,7 @@ add_num_const(char *name, int val, const char *file, const uint line)
struct f_val *v = cfg_alloc(sizeof(struct f_val));
*v = (struct f_val) { .type = T_INT, .val.i = val };
struct symbol *sym = cf_get_symbol(name);
if (sym->class && (sym->scope == conf_this_scope))
if (sym->class && cf_symbol_is_local(sym))
cf_error("Error reading value for %s from %s:%d: already defined", name, file, line);
cf_define_symbol(sym, SYM_CONSTANT | T_INT, val, v);