mirror of
https://github.com/NLnetLabs/unbound.git
synced 2026-01-05 14:29:37 -05:00
- Fixed conflicts for PR #93 and make configure, yacc, lex.
This commit is contained in:
parent
80308880d2
commit
2c8ebe6206
5 changed files with 3742 additions and 3687 deletions
|
|
@ -866,12 +866,12 @@
|
|||
/* the version of the windows API enabled */
|
||||
#undef WINVER
|
||||
|
||||
/* Define if you want dynlib module. */
|
||||
#undef WITH_DYNLIBMODULE
|
||||
|
||||
/* Define if you want Python module. */
|
||||
#undef WITH_PYTHONMODULE
|
||||
|
||||
/* Define if you want dynamic library module. */
|
||||
#undef WITH_DYNLIBMODULE
|
||||
|
||||
/* Define if you want PyUnbound. */
|
||||
#undef WITH_PYUNBOUND
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
15 May 2020: Wouter
|
||||
- Merge PR #93: Add dynamic library support.
|
||||
- Fixed conflicts for PR #93 and make configure, yacc, lex.
|
||||
|
||||
15 May 2020: Ralph
|
||||
- Cache ECS answers with longest scope of CNAME chain.
|
||||
|
||||
|
|
|
|||
4586
util/configlexer.c
4586
util/configlexer.c
File diff suppressed because it is too large
Load diff
2825
util/configparser.c
2825
util/configparser.c
File diff suppressed because it is too large
Load diff
|
|
@ -333,7 +333,9 @@ extern int yydebug;
|
|||
VAR_RPZ_ACTION_OVERRIDE = 539,
|
||||
VAR_RPZ_CNAME_OVERRIDE = 540,
|
||||
VAR_RPZ_LOG = 541,
|
||||
VAR_RPZ_LOG_NAME = 542
|
||||
VAR_RPZ_LOG_NAME = 542,
|
||||
VAR_DYNLIB = 543,
|
||||
VAR_DYNLIB_FILE = 544
|
||||
};
|
||||
#endif
|
||||
/* Tokens. */
|
||||
|
|
@ -622,6 +624,8 @@ extern int yydebug;
|
|||
#define VAR_RPZ_CNAME_OVERRIDE 540
|
||||
#define VAR_RPZ_LOG 541
|
||||
#define VAR_RPZ_LOG_NAME 542
|
||||
#define VAR_DYNLIB 543
|
||||
#define VAR_DYNLIB_FILE 544
|
||||
|
||||
/* Value type. */
|
||||
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
|
||||
|
|
@ -631,7 +635,7 @@ union YYSTYPE
|
|||
|
||||
char* str;
|
||||
|
||||
#line 635 "util/configparser.h"
|
||||
#line 639 "util/configparser.h"
|
||||
|
||||
};
|
||||
typedef union YYSTYPE YYSTYPE;
|
||||
|
|
|
|||
Loading…
Reference in a new issue