Changeset: 9595798b3b92 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9595798b3b92 Modified Files: monetdb5/extras/mal_optimizer_template/opt_sql_append.mx Branch: default Log Message:
opt_sql_append: (hopefully) fixing dllexport/dllimport for Windows TODO: check whether/which LIBS we need to link to on Windows diffs (26 lines): diff --git a/monetdb5/extras/mal_optimizer_template/opt_sql_append.mx b/monetdb5/extras/mal_optimizer_template/opt_sql_append.mx --- a/monetdb5/extras/mal_optimizer_template/opt_sql_append.mx +++ b/monetdb5/extras/mal_optimizer_template/opt_sql_append.mx @@ -87,10 +87,20 @@ comment "Avoid extra BAT copy with sql.a #ifndef _OPT_SQL_APPEND_ #define _OPT_SQL_APPEND_ +#ifdef WIN32 +#ifndef LIBOPT_SQL_APPEND +#define opt_sql_append_export extern __declspec(dllimport) +#else +#define opt_sql_append_export extern __declspec(dllexport) +#endif +#else +#define opt_sql_append_export extern +#endif + #include "opt_prelude.h" -#include "opt_support.h" -@:exportOptimizer(sql_append)@ +/*@:exportOptimizer(sql_append)@*/ +opt_sql_append_export str OPTsql_append(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); #define DEBUG_OPT_SQL_APPEND 61 #define OPTDEBUGsql_append if (optDebug & ((lng)1 << DEBUG_OPT_SQL_APPEND)) _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
