Commit 87128514 authored by unknown's avatar unknown

compilation failure


sql/sql_lex.cc:
  remove bad fix
parent d62f189c
...@@ -466,12 +466,16 @@ C_MODE_END ...@@ -466,12 +466,16 @@ C_MODE_END
#include <assert.h> #include <assert.h>
/* an assert that works at compile-time. only for constant expression */ /* an assert that works at compile-time. only for constant expression */
#ifdef __WIN__
#define compile_time_assert(X) do { } while(0)
#else
#define compile_time_assert(X) \ #define compile_time_assert(X) \
do \ do \
{ \ { \
char compile_time_assert[(X) ? 1 : -1] \ char compile_time_assert[(X) ? 1 : -1] \
__attribute__ ((unused)); \ __attribute__ ((unused)); \
} while(0) } while(0)
#endif
/* Go around some bugs in different OS and compilers */ /* Go around some bugs in different OS and compilers */
#if defined (HPUX11) && defined(_LARGEFILE_SOURCE) #if defined (HPUX11) && defined(_LARGEFILE_SOURCE)
......
...@@ -1772,10 +1772,8 @@ st_lex::st_lex() ...@@ -1772,10 +1772,8 @@ st_lex::st_lex()
:result(0), yacc_yyss(0), yacc_yyvs(0), :result(0), yacc_yyss(0), yacc_yyvs(0),
sql_command(SQLCOM_END) sql_command(SQLCOM_END)
{ {
#ifndef __WIN__
/* Check that plugins_static_buffer is declared immediately after plugins */ /* Check that plugins_static_buffer is declared immediately after plugins */
compile_time_assert((&plugins + 1) == (DYNAMIC_ARRAY*)plugins_static_buffer); compile_time_assert((&plugins + 1) == (DYNAMIC_ARRAY*)plugins_static_buffer);
#endif
my_init_dynamic_array2(&plugins, sizeof(plugin_ref), my_init_dynamic_array2(&plugins, sizeof(plugin_ref),
plugins_static_buffer, plugins_static_buffer,
......
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