Resolved merge conflict

[samtools.git] / misc / bamcheck.c

diff --git a/misc/bamcheck.c b/misc/bamcheck.c
index f61fac18c73ddfb2074e2b7e246dd4ce606a75fb..e5bfb5d0e1db18a0c182349ae0734294451331fc 100644 (file)
--- a/misc/bamcheck.c
+++ b/misc/bamcheck.c
@@ -1018,7 +1018,7 @@ void output_stats(stats_t *stats)
     }
 }
 
-size_t getline(char **line, size_t *n, FILE *fp)
+size_t mygetline(char **line, size_t *n, FILE *fp)
 {
     if (line == NULL || n == NULL || fp == NULL)
     {
@@ -1068,7 +1068,7 @@ void init_regions(stats_t *stats, char *file)
     ssize_t nread;
     int warned = 0;
     int prev_tid=-1, prev_pos=-1;
-    while ((nread = getline(&line, &len, fp)) != -1) 
+    while ((nread = mygetline(&line, &len, fp)) != -1) 
     {
         if ( line[0] == '#' ) continue;