diff options
| author | Ralph Boehme <slow@samba.org> | 2019-05-27 12:27:57 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-06-21 11:49:59 +0000 |
| commit | 3cd4642014bfd69a0cbe4e2b38eb00f1f6f26b65 (patch) | |
| tree | 02dd08775044630b0f7fa4264e8800c314ff7398 | |
| parent | 44b5168845e9be83e47b1ebe7cc75b849d12fad6 (diff) | |
| download | samba-3cd4642014bfd69a0cbe4e2b38eb00f1f6f26b65.tar.gz | |
s3:mdssvc: fix flex compilation error
[4440/4495] Compiling bin/default/source3/rpc_server/mdssvc/sparql_lexer.lex.c
../../source3/rpc_server/mdssvc/sparql_lexer.l:26: error: "yyalloc" redefined [-Werror]
26 | #define yyalloc SMB_MALLOC
Looks like the dirty redefine trick doesn't work anymore with newer flex
versions. According to the flex manual the right thing to do is to provide own
functions for yyalloc and yyrealloc when passing the options "noyyalloc
noyyrealloc".
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13987
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Tue May 28 11:49:06 UTC 2019 on sn-devel-184
(cherry picked from commit 9053391f86a529e0a7dbcd23fa3a555d85c2207c)
Autobuild-User(v4-9-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-9-test): Fri Jun 21 11:49:59 UTC 2019 on sn-devel-144
| -rw-r--r-- | source3/rpc_server/mdssvc/sparql_lexer.l | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source3/rpc_server/mdssvc/sparql_lexer.l b/source3/rpc_server/mdssvc/sparql_lexer.l index e60a3fb5de3..b6383504380 100644 --- a/source3/rpc_server/mdssvc/sparql_lexer.l +++ b/source3/rpc_server/mdssvc/sparql_lexer.l @@ -23,8 +23,6 @@ #include "rpc_server/mdssvc/sparql_parser.tab.h" #define YY_NO_INPUT -#define yyalloc SMB_MALLOC -#define yyrealloc SMB_REALLOC %} %option nounput noyyalloc noyyrealloc prefix="mdsyy" @@ -57,3 +55,13 @@ true {mdsyylval.bval = true; return BOOL;} {UANY}+ {mdsyylval.sval = talloc_strdup(talloc_tos(), mdsyytext); return WORD;} [ \t\n] /* ignore */ %% + +void *yyalloc(yy_size_t bytes) +{ + return SMB_MALLOC(bytes); +} + +void *yyrealloc(void *ptr, yy_size_t bytes) +{ + return SMB_REALLOC(ptr, bytes); +} |