Changeset: cfb3c16bec2a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cfb3c16bec2a Modified Files: monetdb5/optimizer/opt_datavaults.h monetdb5/optimizer/opt_prelude.h Branch: data-vaults Log Message:
Make it compile after the merge with default diffs (26 lines): diff --git a/monetdb5/optimizer/opt_datavaults.h b/monetdb5/optimizer/opt_datavaults.h --- a/monetdb5/optimizer/opt_datavaults.h +++ b/monetdb5/optimizer/opt_datavaults.h @@ -11,7 +11,7 @@ #include "opt_prelude.h" #include "opt_support.h" -opt_export int +mal_export int OPTdatavaultsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); #define OPTDEBUGdatavaults if ( optDebug & ((lng)1 <<DEBUG_OPT_DATAVAULTS) ) diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h --- a/monetdb5/optimizer/opt_prelude.h +++ b/monetdb5/optimizer/opt_prelude.h @@ -238,7 +238,7 @@ mal_export str not_ilikeRef; mal_export str userRef; mal_export str vectorRef; mal_export str zero_or_oneRef; -opt_export str datavaultsRef; -opt_export str checktableRef; -opt_export str analyzetableRef; +mal_export str datavaultsRef; +mal_export str checktableRef; +mal_export str analyzetableRef; #endif _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
