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.h src/hg/blastToPsl/pslBuild.h index 6481828..eadd18a 100644 --- src/hg/blastToPsl/pslBuild.h +++ src/hg/blastToPsl/pslBuild.h @@ -1,36 +1,36 @@ /* object using in building a PSL from a blast record */ #ifndef pslBuild_h #define pslBuild_h enum /* flags for build, including blast algorithm */ { blastn = 0x001, // blast algorithms blastp = 0x002, blastx = 0x004, tblastn = 0x010, tblastx = 0x020, psiblast = 0x040, bldPslx = 0x080, // construct a PSLx with sequence cnvNucCoords = 0x100, }; unsigned pslBuildGetBlastAlgo(char *program); /* determine blast algorithm flags */ struct psl *pslBuildFromHsp(char *qName, int qSize, int qStart, int qEnd, char qStrand, char *qAln, char *tName, int tSize, int tStart, int tEnd, char tStrand, char *tAln, unsigned flags); /* construct a new psl from an HSP. Chaining is left to other programs. */ -FILE *pslBuildScoresOpen(char *scoreFile, bool inclDefs); +FILE *pslBuildScoresOpen(char *scoreFile, boolean inclDefs); /* open score file and write headers */ void pslBuildScoresWrite(FILE* scoreFh, struct psl *psl, double bitScore, double eValue); /* write scores for a PSL */ void pslBuildScoresWriteWithDefs(FILE* scoreFh, struct psl *psl, double bitScore, double eValue, char *qDef, char *tDef); /* write scores and definitions for a PSL */ #endif