Changeset: d181d2dffe58 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d181d2dffe58 Modified Files: sql/backends/monet5/vaults/gadget/gadget.h sql/backends/monet5/vaults/gadget/gadgetFile.c sql/backends/monet5/vaults/gadget/gadgetFile.h Branch: data-vaults Log Message:
fix more compilation errors diffs (41 lines): diff --git a/sql/backends/monet5/vaults/gadget/gadget.h b/sql/backends/monet5/vaults/gadget/gadget.h --- a/sql/backends/monet5/vaults/gadget/gadget.h +++ b/sql/backends/monet5/vaults/gadget/gadget.h @@ -72,4 +72,3 @@ gadget_export str gadgetPHkeyConvert(Cli gadget_export str gadgetPHkeyInvert(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); #endif -typedef unsigned char uchar; diff --git a/sql/backends/monet5/vaults/gadget/gadgetFile.c b/sql/backends/monet5/vaults/gadget/gadgetFile.c --- a/sql/backends/monet5/vaults/gadget/gadgetFile.c +++ b/sql/backends/monet5/vaults/gadget/gadgetFile.c @@ -293,8 +293,7 @@ headerInit(Header *h, FILE *blob) char headerbytes[HEADERLENGTH]; long retval = fread(headerbytes, HEADERLENGTH, 1, blob); int binbytes[2]; - (void) retval; - assert(retval); + assert(retval); headerInit_(h, headerbytes); assert(h->headerOk); @@ -327,7 +326,6 @@ int ReadGadgetFile(GadgetParticles* part char *pos = NULL, *vel=NULL, *id=NULL; long index = MRSNAP_POS_OFFSET; int retval; - (void) retval; stream = fopen(filePath, "rb"); if (!stream) { diff --git a/sql/backends/monet5/vaults/gadget/gadgetFile.h b/sql/backends/monet5/vaults/gadget/gadgetFile.h --- a/sql/backends/monet5/vaults/gadget/gadgetFile.h +++ b/sql/backends/monet5/vaults/gadget/gadgetFile.h @@ -25,8 +25,6 @@ #define MRS_PHBin_DEFAULT 5000 #define MRS_PARTICLE_DEFAULT 5000 -typedef unsigned char uchar; - /*Structures*/ typedef struct Header_ { char* fileName; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list