ac895b36af9fc7ff400eef1e2f3922c86b1ed5be angie Wed Nov 16 14:11:09 2011 -0800 hgBam.h should include samAlignment.h regardless of USE_BAM, in order toavoid compilation error when USE_BAM is not defined. diff --git src/hg/inc/hgBam.h src/hg/inc/hgBam.h index ba2a025..9c9dd8a 100644 --- src/hg/inc/hgBam.h +++ src/hg/inc/hgBam.h @@ -1,33 +1,29 @@ /* hgBam -- interface to binary alignment format files using Heng Li's samtools lib. */ /* these are the components that link to MySQL */ #ifndef HGBAM_H #define HGBAM_H #ifndef BAMFILE_H #include "bamFile.h" #endif -#ifdef USE_BAM - #ifndef SAMALIGNMENT_H #include "samAlignment.h" #endif -#endif - char *bamFileNameFromTable(struct sqlConnection *conn, char *table, char *bamSeqName); /* Return file name from table. If table has a seqName column, then grab the * row associated with bamSeqName (which can be e.g. '1' not 'chr1' if that is the * case in the bam file). */ struct samAlignment *bamFetchSamAlignment(char *fileOrUrl, char *chrom, int start, int end, struct lm *lm); /* Fetch region as a list of samAlignments - which is more or less an unpacked * bam record. Results is allocated out of lm, since it tends to be large... */ struct samAlignment *bamReadNextSamAlignments(samfile_t *fh, int count, struct lm *lm); /* Read next count alignments in SAM format, allocated in lm. May return less than * count at end of file. */ struct ffAli *bamToFfAli(const bam1_t *bam, struct dnaSeq *target, int targetOffset,