diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 08:48:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 08:50:53 +0300 |
| commit | b88f3786484e22759c8402494b8b9cc1e7a1cc46 (patch) | |
| tree | c5003f092dfae7a77e2f89e99c6ede7854ea3bee /storage | |
| parent | 619d22dde54ffe483ef8a57e49ec802b0e30c6bf (diff) | |
| download | mariadb-git-b88f3786484e22759c8402494b8b9cc1e7a1cc46.tar.gz | |
Omit the definition of unused function yyset_extra()
This is follow-up for commit 619d22dde54ffe483ef8a57e49ec802b0e30c6bf
to fix the cmake -DWITH_EMBEDDED_SERVER build.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/pars/lexyy.cc | 2 | ||||
| -rwxr-xr-x | storage/innobase/pars/make_flex.sh | 4 | ||||
| -rw-r--r-- | storage/xtradb/pars/lexyy.cc | 2 | ||||
| -rwxr-xr-x | storage/xtradb/pars/make_flex.sh | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/storage/innobase/pars/lexyy.cc b/storage/innobase/pars/lexyy.cc index 54fe182ae6b..33de48e7b2f 100644 --- a/storage/innobase/pars/lexyy.cc +++ b/storage/innobase/pars/lexyy.cc @@ -1017,7 +1017,7 @@ MY_ATTRIBUTE((unused)) static void yyset_debug ( int debug_flag ); YY_EXTRA_TYPE yyget_extra ( void ); -MY_ATTRIBUTE((unused)) static void yyset_extra ( YY_EXTRA_TYPE user_defined ); + MY_ATTRIBUTE((unused)) static FILE *yyget_in ( void ); diff --git a/storage/innobase/pars/make_flex.sh b/storage/innobase/pars/make_flex.sh index 2ddb1460640..54aebb259d9 100755 --- a/storage/innobase/pars/make_flex.sh +++ b/storage/innobase/pars/make_flex.sh @@ -1,7 +1,7 @@ #!/bin/bash # # Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -# Copyright (c) 2017, MariaDB Corporation. +# Copyright (c) 2017, 2019, MariaDB Corporation. # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software @@ -32,7 +32,7 @@ echo '#include "univ.i"' > $OUTFILE # a warning on Win64. Add the cast. Also define some symbols as static. sed -e ' s/'"$TMPFILE"'/'"$OUTFILE"'/; -s/^void yyset_extra *(YY_EXTRA_TYPE *user_defined *);// +s/^void *yyset_extra *( *YY_EXTRA_TYPE *user_defined *) *;// s/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/; s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/; s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/; diff --git a/storage/xtradb/pars/lexyy.cc b/storage/xtradb/pars/lexyy.cc index 54fe182ae6b..33de48e7b2f 100644 --- a/storage/xtradb/pars/lexyy.cc +++ b/storage/xtradb/pars/lexyy.cc @@ -1017,7 +1017,7 @@ MY_ATTRIBUTE((unused)) static void yyset_debug ( int debug_flag ); YY_EXTRA_TYPE yyget_extra ( void ); -MY_ATTRIBUTE((unused)) static void yyset_extra ( YY_EXTRA_TYPE user_defined ); + MY_ATTRIBUTE((unused)) static FILE *yyget_in ( void ); diff --git a/storage/xtradb/pars/make_flex.sh b/storage/xtradb/pars/make_flex.sh index 2ddb1460640..54aebb259d9 100755 --- a/storage/xtradb/pars/make_flex.sh +++ b/storage/xtradb/pars/make_flex.sh @@ -1,7 +1,7 @@ #!/bin/bash # # Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -# Copyright (c) 2017, MariaDB Corporation. +# Copyright (c) 2017, 2019, MariaDB Corporation. # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software @@ -32,7 +32,7 @@ echo '#include "univ.i"' > $OUTFILE # a warning on Win64. Add the cast. Also define some symbols as static. sed -e ' s/'"$TMPFILE"'/'"$OUTFILE"'/; -s/^void yyset_extra *(YY_EXTRA_TYPE *user_defined *);// +s/^void *yyset_extra *( *YY_EXTRA_TYPE *user_defined *) *;// s/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/; s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/; s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/; |