Commit 521762b6 authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

New upstream version 1.90~b6.4-180807

parent 80f5c46f

plink.c

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 








static const char ver_str[] =









#ifdef STABLE_BUILD









  "PLINK v1.90b6.3"









  "PLINK v1.90b6.4"









#else









  "PLINK v1.90p"









#endif








@@ -105,7 +105,7 @@ static const char ver_str[] =







#else









  " 32-bit"









#endif









  " (17 Jul 2018)";









  " (7 Aug 2018)";









static const char ver_str2[] =









  // include leading space if day < 10, so character length stays the same









  " "
































plink_assoc.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -5918,6 +5918,8 @@ int32_t model_assoc_set_test(pthread_t* threads, FILE* bedfile, uintptr_t bed_of







	}









	goto model_assoc_set_test_perms_done;









      }









      // bugfix (7 Aug 2018): forgot to update marker_unstopped_ct









      marker_unstopped_ct = popcount_longs(unstopped_markers, (marker_ct + BITCT - 1) / BITCT);









    }









    printf("\r%u permutation%s complete.", perms_done, (perms_done != 1)? "s" : "");









    fflush(stdout);