c4711fd217c1bc5058dbbd52317af19706d91d4e angie Mon Feb 28 10:02:50 2011 -0800 Feature #2820 (tabix: add as optional linked library in kent/src):This is a total mystery to me, but for some reason when tabix.h is included via linefile.h, the compiler complains about the redefinition of pslBuildScoresOpen when bool is used... fortunately boolean is OK. I have no idea why using bool would be OK in the rest of the tree but not here. ??? Anyway, since using boolean allows it to compile, I'll just go with that. diff --git src/hg/blastToPsl/pslBuild.c src/hg/blastToPsl/pslBuild.c index b200e91..7d1d76b 100644 --- src/hg/blastToPsl/pslBuild.c +++ src/hg/blastToPsl/pslBuild.c @@ -278,31 +278,31 @@ // construct psl int pslSpace = 8; char strand[3]; safef(strand, sizeof(strand), "%c%c", qStrand, tStrand); struct psl *psl = pslNew(qName, blk.qCoordMult * qSize, blk.qCoordMult * qStart, blk.qCoordMult * qEnd, tName, blk.tCoordMult * tSize, blk.tCoordMult * tStart, blk.tCoordMult * tEnd, strand, pslSpace, ((flags & bldPslx) ? PSL_XA_FORMAT : 0)); // fill in psl hspToBlocks(psl, &pslSpace, &blk, flags); finishPsl(psl, flags); return psl; } -FILE *pslBuildScoresOpen(char *scoreFile, bool inclDefs) +FILE *pslBuildScoresOpen(char *scoreFile, boolean inclDefs) /* open score file and write headers */ { FILE *fh = mustOpen(scoreFile, "w"); fputs("#strand\tqName\tqStart\tqEnd\ttName\ttStart\ttEnd\tbitScore\teVal", fh); if (inclDefs) fputs("\tqDef\ttDef", fh); fputc('\n', fh); return fh; } static void writeBasicScores(FILE* scoreFh, struct psl *psl, double bitScore, double eValue) /* write first part of row */ { fprintf(scoreFh, "%s\t%s\t%d\t%d\t%s\t%d\t%d\t%g\t%g", psl->strand, psl->qName, psl->qStart, psl->qEnd, psl->tName, psl->tStart, psl->tEnd,