Commit b88f3786 authored by Marko Mäkelä's avatar Marko Mäkelä

Omit the definition of unused function yyset_extra()

This is follow-up for commit 619d22dd
to fix the cmake -DWITH_EMBEDDED_SERVER build.
parent 619d22dd
...@@ -1017,7 +1017,7 @@ MY_ATTRIBUTE((unused)) static void yyset_debug ( int debug_flag ); ...@@ -1017,7 +1017,7 @@ MY_ATTRIBUTE((unused)) static void yyset_debug ( int debug_flag );
YY_EXTRA_TYPE yyget_extra ( void ); 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 ); MY_ATTRIBUTE((unused)) static FILE *yyget_in ( void );
......
#!/bin/bash #!/bin/bash
# #
# Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. # 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 # 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 # the terms of the GNU General Public License as published by the Free Software
...@@ -32,7 +32,7 @@ echo '#include "univ.i"' > $OUTFILE ...@@ -32,7 +32,7 @@ echo '#include "univ.i"' > $OUTFILE
# a warning on Win64. Add the cast. Also define some symbols as static. # a warning on Win64. Add the cast. Also define some symbols as static.
sed -e ' sed -e '
s/'"$TMPFILE"'/'"$OUTFILE"'/; 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/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/;
s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/; s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/;
s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/; s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/;
......
...@@ -1017,7 +1017,7 @@ MY_ATTRIBUTE((unused)) static void yyset_debug ( int debug_flag ); ...@@ -1017,7 +1017,7 @@ MY_ATTRIBUTE((unused)) static void yyset_debug ( int debug_flag );
YY_EXTRA_TYPE yyget_extra ( void ); 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 ); MY_ATTRIBUTE((unused)) static FILE *yyget_in ( void );
......
#!/bin/bash #!/bin/bash
# #
# Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. # 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 # 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 # the terms of the GNU General Public License as published by the Free Software
...@@ -32,7 +32,7 @@ echo '#include "univ.i"' > $OUTFILE ...@@ -32,7 +32,7 @@ echo '#include "univ.i"' > $OUTFILE
# a warning on Win64. Add the cast. Also define some symbols as static. # a warning on Win64. Add the cast. Also define some symbols as static.
sed -e ' sed -e '
s/'"$TMPFILE"'/'"$OUTFILE"'/; 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/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/;
s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/; s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/;
s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/; s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment