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/inc/genomeRangeTree.h src/inc/genomeRangeTree.h
index 66d1e46..2ab7b5c 100644
--- src/inc/genomeRangeTree.h
+++ src/inc/genomeRangeTree.h
@@ -44,31 +44,31 @@
 void genomeRangeTreeFree(struct genomeRangeTree **pTree);
 /* Free up genomeRangeTree. */
 
 struct rbTree *genomeRangeTreeFindRangeTree(struct genomeRangeTree *tree, char *chrom);
 /* Find the rangeTree for this chromosome, if any. Returns NULL if chrom not found.
  * Free with genomeRangeTreeFree. */
 
 struct rbTree *genomeRangeTreeFindOrAddRangeTree(struct genomeRangeTree *tree, char *chrom);
 /* Find the rangeTree for this chromosome, or add new chrom and empty rangeTree if not found.
  * Free with genomeRangeTreeFree. */
 
 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. */
 
-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). */
 
 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 */
 
 struct range *genomeRangeTreeAddValList(struct genomeRangeTree *tree, char *chrom, int start, int end, void *val);
 /* Add range to tree, merging with existing ranges if need be.