Do not compile _BCF_QUAD by default

diff --git a/bcftools/Makefile b/bcftools/Makefile
index e3b92e9d29f96734495a4acb0c536642a1918d42..5a3dc763f8105ba3dc8db43db390a4b13c0ba252 100644 (file)
--- a/bcftools/Makefile
+++ b/bcftools/Makefile
@@ -1,6 +1,6 @@
 CC=                    gcc
 CFLAGS=                -g -Wall -O2 #-m64 #-arch ppc
-DFLAGS=                -D_FILE_OFFSET_BITS=64 -D_USE_KNETFILE -D_BCF_QUAD
+DFLAGS=                -D_FILE_OFFSET_BITS=64 -D_USE_KNETFILE
 LOBJS=         bcf.o vcf.o bcfutils.o prob1.o kfunc.o index.o fet.o
 OMISC=         ..
 AOBJS=         call1.o main.o $(OMISC)/kstring.o $(OMISC)/bgzf.o $(OMISC)/knetfile.o

diff --git a/bcftools/prob1.c b/bcftools/prob1.c
index e2c090ac0dca832292b84a6533446469d63e6ed3..1d0328f936c180ebb447e4006631fa2c018363b6 100644 (file)
--- a/bcftools/prob1.c
+++ b/bcftools/prob1.c
@@ -319,6 +319,8 @@ static void contrast(bcf_p1aux_t *ma, double pc[4]) // mc_cal_y() must be called
                sum = z[0] + z[1] + z[2];
                pc[2] = z[0] / sum; pc[3] = z[1] / sum;
        }
+#else
+       pc[2] = pc[3] = 0.;
 #endif
        for (k = 0, sum_alt = 0.; k <= ma->M; ++k)
                sum_alt += (long double)ma->phi[k] * ma->z[k];