From a52a1f8d565774c0379567da3cb32c145c01931d Mon Sep 17 00:00:00 2001 From: "kostja@bodhi.local" <> Date: Thu, 8 Mar 2007 12:04:45 +0300 Subject: [PATCH] Fix -ansi -pedantic warning (can't cast a pointer to function to a pointer to object, that is, int foo(); void *bar= (void*) foo is not allowed. --- sql/lex.h | 4 ++-- sql/lex_symbol.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/lex.h b/sql/lex.h index 5299be89d3..352d80da5c 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -32,10 +32,10 @@ SYM_GROUP sym_group_rtree= {"RTree keys", "HAVE_RTREE_KEYS"}; #define SYM(A) SYM_OR_NULL(A),0,0,&sym_group_common #define F_SYM(A) SYM_OR_NULL(A) -#define CREATE_FUNC(A) (void *)(SYM_OR_NULL(A)), &sym_group_common +#define CREATE_FUNC(A) (void (*)())(SYM_OR_NULL(A)), &sym_group_common #ifdef HAVE_SPATIAL -#define CREATE_FUNC_GEOM(A) (void *)(SYM_OR_NULL(A)), &sym_group_geom +#define CREATE_FUNC_GEOM(A) (void (*)())(SYM_OR_NULL(A)), &sym_group_geom #else #define CREATE_FUNC_GEOM(A) 0, &sym_group_geom #endif diff --git a/sql/lex_symbol.h b/sql/lex_symbol.h index 5d92950803..c87cdb4ec4 100644 --- a/sql/lex_symbol.h +++ b/sql/lex_symbol.h @@ -25,7 +25,7 @@ typedef struct st_symbol { const char *name; uint tok; uint length; - void *create_func; + void (*create_func)(); struct st_sym_group *group; } SYMBOL; -- 2.30.9