From e285ecd3fcd39eac2051ea7bccd5257c6dfb72ab Mon Sep 17 00:00:00 2001 From: "durbrowk@ncbi.nlm.nih.gov" Date: Wed, 5 Apr 2017 12:50:07 -0400 Subject: [PATCH] renamed function to resolve name clash with gnutards --- tools/bam-loader/bam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bam-loader/bam.c b/tools/bam-loader/bam.c index e60fe38e..780d68c3 100644 --- a/tools/bam-loader/bam.c +++ b/tools/bam-loader/bam.c @@ -3997,7 +3997,7 @@ static unsigned insert_B(unsigned const T, unsigned const G, unsigned const n, u return n; } -static unsigned canonicalize(uint32_t cigar[], unsigned n) +static unsigned canonicalizeCIGAR(uint32_t cigar[], unsigned n) { unsigned i; @@ -4042,7 +4042,7 @@ static unsigned GetCGCigar(BAM_Alignment const *self, unsigned const N, uint32_t memmove(cigar, getCigarBase(self), n * 4); if (n > 1) - n = canonicalize(cigar, n); /* just in case */ + n = canonicalizeCIGAR(cigar, n); /* just in case */ for (i = 0, S = 0; i < gaps; ++i) { unsigned const s = seg[2 * i + 0];