bac82874036ee294850fcfe64cc6cba209c3262d
markd
  Tue Jun 25 09:41:44 2019 +0100
added some conditionals and renamed a variable to make files more friendly to include in C++ code

diff --git src/lib/genomeRangeTree.c src/lib/genomeRangeTree.c
index bbcf26b..f812b5a 100644
--- src/lib/genomeRangeTree.c
+++ src/lib/genomeRangeTree.c
@@ -68,31 +68,31 @@
 {
 struct hashEl *hel;
 hel = hashStore(tree->hash, chrom);
 if (hel->val == NULL) /* need to add a new rangeTree */
     hel->val = rangeTreeNewDetailed(tree->lm, tree->stack);
 return hel->val;
 }
 
 struct range *genomeRangeTreeAdd(struct genomeRangeTree *tree, char *chrom, int start, int end)
 /* Add range to tree, merging with existing ranges if need be. 
  * Adds new rangeTree if chrom not found. */
 {
 return rangeTreeAdd(genomeRangeTreeFindOrAddRangeTree(tree,chrom), start, end);
 }
 
-struct range *genomeRangeTreeAddVal(struct genomeRangeTree *tree, char *chrom, int start, int end, void *val, void *(*mergeVals)(void *existing, void*new))
+struct range *genomeRangeTreeAddVal(struct genomeRangeTree *tree, char *chrom, int start, int end, void *val, void *(*mergeVals)(void *existing, void *newVal))
 /* Add range to tree, merging with existing ranges if need be. 
  * Adds new rangeTree if chrom not found. 
  * If this is a new range, set the value to this val.
  * If there are existing items for this range, and if mergeVals function is not null, 
  * apply mergeVals to the existing values and this new val, storing the result as the val
  * for this range (see rangeTreeAddValCount() and rangeTreeAddValList() below for examples). */
 {
 return rangeTreeAddVal(genomeRangeTreeFindOrAddRangeTree(tree,chrom), start, end, val, mergeVals);
 }
 
 struct range *genomeRangeTreeAddValCount(struct genomeRangeTree *tree, char *chrom, int start, int end)
 /* Add range to tree, merging with existing ranges if need be. 
  * Adds new rangeTree if chrom not found. 
  * Set range val to count of elements in the range. Counts are pointers to 
  * ints allocated in tree localmem */