MonetDB: mosaic - Compilation issues

[Martin Kersten]

Changeset: 509eb8bd787f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=509eb8bd787f
Modified Files:
        monetdb5/modules/mosaic/mosaic_prefix.c
Branch: mosaic
Log Message:

Compilation issues


diffs (66 lines):

diff --git a/monetdb5/modules/mosaic/mosaic_prefix.c 
b/monetdb5/modules/mosaic/mosaic_prefix.c
--- a/monetdb5/modules/mosaic/mosaic_prefix.c
+++ b/monetdb5/modules/mosaic/mosaic_prefix.c
@@ -125,7 +125,7 @@ MOSlayout_prefix(Client cntxt, MOStask t
 void
 MOSadvance_prefix(Client cntxt, MOStask task)
 {
-       int bits = 0, bytes;
+       int bits = 0, bytes= 0;
        int size;
        (void) cntxt;
 
@@ -606,7 +606,6 @@ MOSdecompress_prefix(Client cntxt, MOSta
 #define  subselect_prefix(TPE, TPE2) \
 {      TPE2 *dst =  (TPE2*)  MOScodevector(task);\
        TPE2 mask = *dst++, val = *dst++,v;\
-       int bits;\
        TPE value;\
        bits = (int) (val & (~mask));\
        val = val & mask;\
@@ -688,7 +687,7 @@ MOSdecompress_prefix(Client cntxt, MOSta
 str
 MOSsubselect_prefix(Client cntxt,  MOStask task, void *low, void *hgh, bit 
*li, bit *hi, bit *anti){
        oid *o;
-       int cmp;
+       int bits,cmp;
        BUN i = 0,first,last;
        BitVector base;
        // set the oid range covered
@@ -730,7 +729,6 @@ MOSsubselect_prefix(Client cntxt,  MOSta
 {      TPE low,hgh;\
     TPE2 *dst =  (TPE2*)  (((char*) blk) + MosaicBlkSize);\
     TPE2 mask = *dst++, val = *dst++,v;\
-    int bits;\
     TPE value;\
        bits = (int)( val & (~mask));\
        val = val & mask;\
@@ -779,7 +777,7 @@ str
 MOSthetasubselect_prefix(Client cntxt,  MOStask task, void *input, str oper)
 {
        oid *o;
-       int anti=0;
+       int bits, anti=0;
        BUN i=0,first,last;
        MosaicBlk blk = task->blk;
     BitVector base;
@@ -835,7 +833,8 @@ MOSthetasubselect_prefix(Client cntxt,  
 str
 MOSprojection_prefix(Client cntxt,  MOStask task)
 {
-       BUN bits,i=0, first,last;
+       int bits; 
+       BUN i=0, first,last;
     BitVector base;
        (void) cntxt;
 
@@ -911,7 +910,8 @@ break;
 str
 MOSsubjoin_prefix(Client cntxt,  MOStask task)
 {
-       BUN bits,i= 0,n,first,last;
+       int bits;
+       BUN i= 0,n,first,last;
        oid o, oo;
        BitVector base;
        (void) cntxt;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list