Changeset: 7778dc49bc71 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7778dc49bc71
Modified Files:
        monetdb5/mal/mal.h
        monetdb5/modules/mosaic/mosaic.h
        monetdb5/modules/mosaic/mosaic_delta.h
        monetdb5/modules/mosaic/mosaic_dictionary.h
        monetdb5/modules/mosaic/mosaic_frame.h
        monetdb5/modules/mosaic/mosaic_hdr.h
        monetdb5/modules/mosaic/mosaic_linear.h
        monetdb5/modules/mosaic/mosaic_literal.h
        monetdb5/modules/mosaic/mosaic_prefix.h
        monetdb5/modules/mosaic/mosaic_runlength.h
Branch: mosaic
Log Message:

Port changeset 8871491aac93 to mosaic branch.


diffs (truncated from 305 to 300 lines):

diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -17,7 +17,7 @@
 #include <gdk.h>
 
 #ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5)
+#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5) && !defined(LIBMOSAIC)
 #define mal_export extern __declspec(dllimport)
 #else
 #define mal_export extern __declspec(dllexport)
diff --git a/monetdb5/modules/mosaic/mosaic.h b/monetdb5/modules/mosaic/mosaic.h
--- a/monetdb5/modules/mosaic/mosaic.h
+++ b/monetdb5/modules/mosaic/mosaic.h
@@ -219,36 +219,26 @@ if ( task->n && task->cl ){\
        }\
 } else if (task->cl) continue;
 
-#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5)
-#define mosaic_export extern __declspec(dllimport)
-#else
-#define mosaic_export extern __declspec(dllexport)
-#endif
-#else
-#define mosaic_export extern
-#endif
-
-mosaic_export char *MOSfiltername[];
-mosaic_export BUN MOSblocklimit;
-mosaic_export str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mosaic_export str MOSdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mosaic_export str MOSdecompressInternal(Client cntxt, bat *ret, bat *bid);
-mosaic_export str MOSdecompressStorage(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
-mosaic_export str MOScompressInternal(Client cntxt, bat *ret, bat *bid, 
MOStask task, int debug);
-mosaic_export str MOSanalyse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mosaic_export str MOSsubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mosaic_export str MOSthetasubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mosaic_export str MOSprojection(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mosaic_export str MOSsubjoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mosaic_export str MOSdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
-mosaic_export str MOSlayout(Client cntxt, BAT *b, BAT *btech, BAT *bcount, BAT 
*binput, BAT *boutput, BAT *bproperties, str compressionscheme);
-mosaic_export str MOSsliceInternal(Client cntxt, bat *slices, BUN size, BAT 
*b);
-mosaic_export int MOSanalyseInternal(Client cntxt, int threshold, MOStask 
task, bat bid);
-mosaic_export void MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT 
*output, BAT *factor, BAT *run, str compressions);
-mosaic_export str MOSoptimizer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mosaic_export str MOSslice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
-mosaic_export void MOSblk(MosaicBlk blk);
-mosaic_export BUN MOSlimit(void);
+mal_export char *MOSfiltername[];
+mal_export BUN MOSblocklimit;
+mal_export str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
+mal_export str MOSdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+mal_export str MOSdecompressInternal(Client cntxt, bat *ret, bat *bid);
+mal_export str MOSdecompressStorage(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+mal_export str MOScompressInternal(Client cntxt, bat *ret, bat *bid, MOStask 
task, int debug);
+mal_export str MOSanalyse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
+mal_export str MOSsubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+mal_export str MOSthetasubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+mal_export str MOSprojection(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+mal_export str MOSsubjoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
+mal_export str MOSdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
+mal_export str MOSlayout(Client cntxt, BAT *b, BAT *btech, BAT *bcount, BAT 
*binput, BAT *boutput, BAT *bproperties, str compressionscheme);
+mal_export str MOSsliceInternal(Client cntxt, bat *slices, BUN size, BAT *b);
+mal_export int MOSanalyseInternal(Client cntxt, int threshold, MOStask task, 
bat bid);
+mal_export void MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT 
*output, BAT *factor, BAT *run, str compressions);
+mal_export str MOSoptimizer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+mal_export str MOSslice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
+mal_export void MOSblk(MosaicBlk blk);
+mal_export BUN MOSlimit(void);
 
 #endif /* _MOSLIST_H */
diff --git a/monetdb5/modules/mosaic/mosaic_delta.h 
b/monetdb5/modules/mosaic/mosaic_delta.h
--- a/monetdb5/modules/mosaic/mosaic_delta.h
+++ b/monetdb5/modules/mosaic/mosaic_delta.h
@@ -29,15 +29,15 @@
 #include "mal_interpreter.h"
 #include "mal_client.h"
 
-mosaic_export void MOSdump_delta(Client cntxt, MOStask task);
-mosaic_export void MOSlayout_delta(Client cntxt, MOStask task, BAT *btech, BAT 
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSadvance_delta(Client cntxt, MOStask task);
-mosaic_export void MOSskip_delta(Client cntxt, MOStask task);
-mosaic_export flt  MOSestimate_delta(Client cntxt, MOStask task);
-mosaic_export void MOScompress_delta(Client cntxt, MOStask task);
-mosaic_export void MOSdecompress_delta(Client cntxt, MOStask task);
-mosaic_export str MOSsubselect_delta(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
-mosaic_export str MOSthetasubselect_delta(Client cntxt,  MOStask task, void 
*val, str oper);
-mosaic_export str MOSprojection_delta(Client cntxt,  MOStask task);
-mosaic_export str MOSsubjoin_delta(Client cntxt,  MOStask task);
+mal_export void MOSdump_delta(Client cntxt, MOStask task);
+mal_export void MOSlayout_delta(Client cntxt, MOStask task, BAT *btech, BAT 
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSadvance_delta(Client cntxt, MOStask task);
+mal_export void MOSskip_delta(Client cntxt, MOStask task);
+mal_export flt  MOSestimate_delta(Client cntxt, MOStask task);
+mal_export void MOScompress_delta(Client cntxt, MOStask task);
+mal_export void MOSdecompress_delta(Client cntxt, MOStask task);
+mal_export str MOSsubselect_delta(Client cntxt,  MOStask task, void *low, void 
*hgh, bit *li, bit *hi, bit *anti);
+mal_export str MOSthetasubselect_delta(Client cntxt,  MOStask task, void *val, 
str oper);
+mal_export str MOSprojection_delta(Client cntxt,  MOStask task);
+mal_export str MOSsubjoin_delta(Client cntxt,  MOStask task);
 #endif /* _MOSAIC_DELTA_ */
diff --git a/monetdb5/modules/mosaic/mosaic_dictionary.h 
b/monetdb5/modules/mosaic/mosaic_dictionary.h
--- a/monetdb5/modules/mosaic/mosaic_dictionary.h
+++ b/monetdb5/modules/mosaic/mosaic_dictionary.h
@@ -31,17 +31,17 @@
 #define DICTTHRESHOLD 4192
 #define DICTSIZE 256 
 
-mosaic_export void MOScreatedictionary(Client cntxt, MOStask task);
-mosaic_export void MOSdump_dictionary(Client cntxt, MOStask task);
-mosaic_export void MOSlayout_dictionary(Client cntxt, MOStask task, BAT 
*btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSlayout_dictionary_hdr(Client cntxt, MOStask task, BAT 
*btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSadvance_dictionary(Client cntxt, MOStask task);
-mosaic_export void MOSskip_dictionary(Client cntxt, MOStask task);
-mosaic_export flt  MOSestimate_dictionary(Client cntxt, MOStask task);
-mosaic_export void MOScompress_dictionary(Client cntxt, MOStask task);
-mosaic_export void MOSdecompress_dictionary(Client cntxt, MOStask task);
-mosaic_export str MOSsubselect_dictionary(Client cntxt,  MOStask task, void 
*low, void *hgh, bit *li, bit *hi, bit *anti);
-mosaic_export str MOSthetasubselect_dictionary(Client cntxt,  MOStask task, 
void *val, str oper);
-mosaic_export str MOSprojection_dictionary(Client cntxt,  MOStask task);
-mosaic_export str MOSsubjoin_dictionary(Client cntxt,  MOStask task);
+mal_export void MOScreatedictionary(Client cntxt, MOStask task);
+mal_export void MOSdump_dictionary(Client cntxt, MOStask task);
+mal_export void MOSlayout_dictionary(Client cntxt, MOStask task, BAT *btech, 
BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSlayout_dictionary_hdr(Client cntxt, MOStask task, BAT 
*btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSadvance_dictionary(Client cntxt, MOStask task);
+mal_export void MOSskip_dictionary(Client cntxt, MOStask task);
+mal_export flt  MOSestimate_dictionary(Client cntxt, MOStask task);
+mal_export void MOScompress_dictionary(Client cntxt, MOStask task);
+mal_export void MOSdecompress_dictionary(Client cntxt, MOStask task);
+mal_export str MOSsubselect_dictionary(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
+mal_export str MOSthetasubselect_dictionary(Client cntxt,  MOStask task, void 
*val, str oper);
+mal_export str MOSprojection_dictionary(Client cntxt,  MOStask task);
+mal_export str MOSsubjoin_dictionary(Client cntxt,  MOStask task);
 #endif /* _MOSAIC_DICT_ */
diff --git a/monetdb5/modules/mosaic/mosaic_frame.h 
b/monetdb5/modules/mosaic/mosaic_frame.h
--- a/monetdb5/modules/mosaic/mosaic_frame.h
+++ b/monetdb5/modules/mosaic/mosaic_frame.h
@@ -29,17 +29,17 @@
 #include "mal_client.h"
 #include "mosaic_dictionary.h"
 
-mosaic_export void MOScreateframeDictionary(Client cntxt, MOStask task);
-mosaic_export void MOSdump_frame(Client cntxt, MOStask task);
-mosaic_export void MOSlayout_frame_hdr(Client cntxt, MOStask task, BAT *btech, 
BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSlayout_frame(Client cntxt, MOStask task, BAT *btech, BAT 
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSadvance_frame(Client cntxt, MOStask task);
-mosaic_export void MOSskip_frame(Client cntxt, MOStask task);
-mosaic_export flt  MOSestimate_frame(Client cntxt, MOStask task);
-mosaic_export void MOScompress_frame(Client cntxt, MOStask task);
-mosaic_export void MOSdecompress_frame(Client cntxt, MOStask task);
-mosaic_export str MOSsubselect_frame(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
-mosaic_export str MOSthetasubselect_frame(Client cntxt,  MOStask task, void 
*val, str oper);
-mosaic_export str MOSprojection_frame(Client cntxt,  MOStask task);
-mosaic_export str MOSsubjoin_frame(Client cntxt,  MOStask task);
+mal_export void MOScreateframeDictionary(Client cntxt, MOStask task);
+mal_export void MOSdump_frame(Client cntxt, MOStask task);
+mal_export void MOSlayout_frame_hdr(Client cntxt, MOStask task, BAT *btech, 
BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSlayout_frame(Client cntxt, MOStask task, BAT *btech, BAT 
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSadvance_frame(Client cntxt, MOStask task);
+mal_export void MOSskip_frame(Client cntxt, MOStask task);
+mal_export flt  MOSestimate_frame(Client cntxt, MOStask task);
+mal_export void MOScompress_frame(Client cntxt, MOStask task);
+mal_export void MOSdecompress_frame(Client cntxt, MOStask task);
+mal_export str MOSsubselect_frame(Client cntxt,  MOStask task, void *low, void 
*hgh, bit *li, bit *hi, bit *anti);
+mal_export str MOSthetasubselect_frame(Client cntxt,  MOStask task, void *val, 
str oper);
+mal_export str MOSprojection_frame(Client cntxt,  MOStask task);
+mal_export str MOSsubjoin_frame(Client cntxt,  MOStask task);
 #endif /* _MOSAIC_FRAME_ */
diff --git a/monetdb5/modules/mosaic/mosaic_hdr.h 
b/monetdb5/modules/mosaic/mosaic_hdr.h
--- a/monetdb5/modules/mosaic/mosaic_hdr.h
+++ b/monetdb5/modules/mosaic/mosaic_hdr.h
@@ -28,8 +28,8 @@
 #include "mal_interpreter.h"
 #include "mal_client.h"
 
-mosaic_export void MOSdumpHeader(Client cntxt, MOStask task);
-mosaic_export void MOSupdateHeader(Client cntxt, MOStask task);
-mosaic_export void MOSinitHeader(MOStask task);
-mosaic_export void MOSinitializeScan(Client cntxt, MOStask task, int startblk, 
int stopblk);
+mal_export void MOSdumpHeader(Client cntxt, MOStask task);
+mal_export void MOSupdateHeader(Client cntxt, MOStask task);
+mal_export void MOSinitHeader(MOStask task);
+mal_export void MOSinitializeScan(Client cntxt, MOStask task, int startblk, 
int stopblk);
 #endif /* _MOSAIC_HDR_ */
diff --git a/monetdb5/modules/mosaic/mosaic_linear.h 
b/monetdb5/modules/mosaic/mosaic_linear.h
--- a/monetdb5/modules/mosaic/mosaic_linear.h
+++ b/monetdb5/modules/mosaic/mosaic_linear.h
@@ -28,15 +28,15 @@
 #include "mal_interpreter.h"
 #include "mal_client.h"
 
-mosaic_export void MOSdump_linear(Client cntxt, MOStask task);
-mosaic_export void MOSlayout_linear(Client cntxt, MOStask task, BAT *btech, 
BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSadvance_linear(Client cntxt, MOStask task);
-mosaic_export void MOSskip_linear(Client cntxt, MOStask task);
-mosaic_export flt  MOSestimate_linear(Client cntxt, MOStask task);
-mosaic_export void MOScompress_linear(Client cntxt, MOStask task);
-mosaic_export void MOSdecompress_linear(Client cntxt, MOStask task);
-mosaic_export str MOSsubselect_linear(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
-mosaic_export str MOSthetasubselect_linear(Client cntxt,  MOStask task, void 
*val, str oper);
-mosaic_export str MOSprojection_linear(Client cntxt,  MOStask task);
-mosaic_export str MOSsubjoin_linear(Client cntxt,  MOStask task);
+mal_export void MOSdump_linear(Client cntxt, MOStask task);
+mal_export void MOSlayout_linear(Client cntxt, MOStask task, BAT *btech, BAT 
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSadvance_linear(Client cntxt, MOStask task);
+mal_export void MOSskip_linear(Client cntxt, MOStask task);
+mal_export flt  MOSestimate_linear(Client cntxt, MOStask task);
+mal_export void MOScompress_linear(Client cntxt, MOStask task);
+mal_export void MOSdecompress_linear(Client cntxt, MOStask task);
+mal_export str MOSsubselect_linear(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
+mal_export str MOSthetasubselect_linear(Client cntxt,  MOStask task, void 
*val, str oper);
+mal_export str MOSprojection_linear(Client cntxt,  MOStask task);
+mal_export str MOSsubjoin_linear(Client cntxt,  MOStask task);
 #endif /* _MOSAIC_LINEAR_ */
diff --git a/monetdb5/modules/mosaic/mosaic_literal.h 
b/monetdb5/modules/mosaic/mosaic_literal.h
--- a/monetdb5/modules/mosaic/mosaic_literal.h
+++ b/monetdb5/modules/mosaic/mosaic_literal.h
@@ -29,14 +29,14 @@
 #include "mal_interpreter.h"
 #include "mal_client.h"
 
-mosaic_export void MOSdump_literal(Client cntxt, MOStask task);
-mosaic_export void MOSlayout_literal(Client cntxt, MOStask task, BAT *btech, 
BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSadvance_literal(Client cntxt, MOStask task);
-mosaic_export void MOSskip_literal(Client cntxt, MOStask task);
-mosaic_export void MOScompress_literal(Client cntxt, MOStask task);
-mosaic_export void MOSdecompress_literal(Client cntxt, MOStask task);
-mosaic_export str MOSsubselect_literal(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
-mosaic_export str MOSthetasubselect_literal(Client cntxt,  MOStask task, void 
*val, str oper);
-mosaic_export str MOSprojection_literal(Client cntxt,  MOStask task);
-mosaic_export str MOSsubjoin_literal(Client cntxt,  MOStask task);
+mal_export void MOSdump_literal(Client cntxt, MOStask task);
+mal_export void MOSlayout_literal(Client cntxt, MOStask task, BAT *btech, BAT 
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSadvance_literal(Client cntxt, MOStask task);
+mal_export void MOSskip_literal(Client cntxt, MOStask task);
+mal_export void MOScompress_literal(Client cntxt, MOStask task);
+mal_export void MOSdecompress_literal(Client cntxt, MOStask task);
+mal_export str MOSsubselect_literal(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
+mal_export str MOSthetasubselect_literal(Client cntxt,  MOStask task, void 
*val, str oper);
+mal_export str MOSprojection_literal(Client cntxt,  MOStask task);
+mal_export str MOSsubjoin_literal(Client cntxt,  MOStask task);
 #endif /* _MOSAIC_NONE_ */
diff --git a/monetdb5/modules/mosaic/mosaic_prefix.h 
b/monetdb5/modules/mosaic/mosaic_prefix.h
--- a/monetdb5/modules/mosaic/mosaic_prefix.h
+++ b/monetdb5/modules/mosaic/mosaic_prefix.h
@@ -29,15 +29,15 @@
 #include "mal_interpreter.h"
 #include "mal_client.h"
 
-mosaic_export void MOSdump_prefix(Client cntxt, MOStask task);
-mosaic_export void MOSlayout_prefix(Client cntxt, MOStask task, BAT *btech, 
BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSadvance_prefix(Client cntxt, MOStask task);
-mosaic_export void MOSskip_prefix(Client cntxt, MOStask task);
-mosaic_export flt  MOSestimate_prefix(Client cntxt, MOStask task);
-mosaic_export void MOScompress_prefix(Client cntxt, MOStask task);
-mosaic_export void MOSdecompress_prefix(Client cntxt, MOStask task);
-mosaic_export str MOSsubselect_prefix(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
-mosaic_export str MOSthetasubselect_prefix(Client cntxt,  MOStask task, void 
*val, str oper);
-mosaic_export str MOSprojection_prefix(Client cntxt,  MOStask task);
-mosaic_export str MOSsubjoin_prefix(Client cntxt,  MOStask task);
+mal_export void MOSdump_prefix(Client cntxt, MOStask task);
+mal_export void MOSlayout_prefix(Client cntxt, MOStask task, BAT *btech, BAT 
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSadvance_prefix(Client cntxt, MOStask task);
+mal_export void MOSskip_prefix(Client cntxt, MOStask task);
+mal_export flt  MOSestimate_prefix(Client cntxt, MOStask task);
+mal_export void MOScompress_prefix(Client cntxt, MOStask task);
+mal_export void MOSdecompress_prefix(Client cntxt, MOStask task);
+mal_export str MOSsubselect_prefix(Client cntxt,  MOStask task, void *low, 
void *hgh, bit *li, bit *hi, bit *anti);
+mal_export str MOSthetasubselect_prefix(Client cntxt,  MOStask task, void 
*val, str oper);
+mal_export str MOSprojection_prefix(Client cntxt,  MOStask task);
+mal_export str MOSsubjoin_prefix(Client cntxt,  MOStask task);
 #endif /* _MOSAIC_PREFIX_ */
diff --git a/monetdb5/modules/mosaic/mosaic_runlength.h 
b/monetdb5/modules/mosaic/mosaic_runlength.h
--- a/monetdb5/modules/mosaic/mosaic_runlength.h
+++ b/monetdb5/modules/mosaic/mosaic_runlength.h
@@ -29,15 +29,15 @@
 #include "mal_interpreter.h"
 #include "mal_client.h"
 
-mosaic_export void MOSdump_runlength(Client cntxt, MOStask task);
-mosaic_export void MOSlayout_runlength(Client cntxt, MOStask task, BAT *btech, 
BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
-mosaic_export void MOSadvance_runlength(Client cntxt, MOStask task);
-mosaic_export void MOSskip_runlength(Client cntxt, MOStask task);
-mosaic_export flt  MOSestimate_runlength(Client cntxt, MOStask task);
-mosaic_export void MOScompress_runlength(Client cntxt, MOStask task);
-mosaic_export void MOSdecompress_runlength(Client cntxt, MOStask task);
-mosaic_export str MOSsubselect_runlength(Client cntxt,  MOStask task, void 
*low, void *hgh, bit *li, bit *hi, bit *anti);
-mosaic_export str MOSthetasubselect_runlength(Client cntxt,  MOStask task, 
void *val, str oper);
-mosaic_export str MOSprojection_runlength(Client cntxt,  MOStask task);
-mosaic_export str MOSsubjoin_runlength(Client cntxt,  MOStask task);
+mal_export void MOSdump_runlength(Client cntxt, MOStask task);
+mal_export void MOSlayout_runlength(Client cntxt, MOStask task, BAT *btech, 
BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+mal_export void MOSadvance_runlength(Client cntxt, MOStask task);
+mal_export void MOSskip_runlength(Client cntxt, MOStask task);
+mal_export flt  MOSestimate_runlength(Client cntxt, MOStask task);
+mal_export void MOScompress_runlength(Client cntxt, MOStask task);
+mal_export void MOSdecompress_runlength(Client cntxt, MOStask task);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to