90339aa1d74677c8180a416e9361280acfab9caa markd Tue Aug 16 19:23:22 2016 -0700 fix compilation error with C99 style inline used by default by clang on OS/X diff --git src/aladdin/aladdin/aladdin.c src/aladdin/aladdin/aladdin.c index ae921e8..62976c0 100644 --- src/aladdin/aladdin/aladdin.c +++ src/aladdin/aladdin/aladdin.c @@ -317,43 +317,43 @@ curScores[destState] = newScore; \ allStates[destState][dnaIx] = parent; \ } #define source(sourceState, emitScore) \ if ((oneScore = transProbLookup[sourceState][destState] + emitScore + prevScores[sourceState]) > newScore) \ { \ newScore = oneScore; \ parent = sourceState; \ } typedef int Mark0[5]; typedef int Mark1[5][5]; typedef int Mark2[5][5][5]; -inline int prob0(Mark0 m, DNA base) +static inline int prob0(Mark0 m, DNA base) /* Return probability of base considering 0 before */ { return m[ntVal[(int)base]+1]; } -inline int prob1(Mark1 m, DNA *dna) +static inline int prob1(Mark1 m, DNA *dna) /* Return probability of base considering 1 before */ { return m[ntVal[(int)dna[-1]]+1][ntVal[(int)dna[0]]+1]; } -inline int prob2(Mark2 m, DNA *dna) +static inline int prob2(Mark2 m, DNA *dna) /* Return probability of base considering 2 before */ { return m[ntVal[(int)dna[-2]]+1][ntVal[(int)dna[-1]]+1][ntVal[(int)dna[0]]+1]; } void makeM2Ig(Mark2 m, int unlikely) /* Make approximation of intergenic. */ { int i,j; for (i=0; i<5; i++) { for (j=0; j<5; j++) { m[i][j][A_BASE_VAL+1] = m[i][j][T_BASE_VAL+1] = scaledLog(0.32);