Skip to content

Conversation

@pd3
Copy link
Member

@pd3 pd3 commented Aug 14, 2018

No description provided.

jmarshall added a commit to jmarshall/pysam that referenced this pull request Mar 2, 2022
Exclude samtools/bam2bcf.[ch] which (starting in samtools 1.15) are only
used by bam_tview.c (which we already exclude) and contain functions that
collide with bcftools. Remove obsolete exclusions for removed items.

In import/pysam.h, add prefixes to several more functions that otherwise
conflict between libcsamtools and libcbcftools. Fixes pysam-developers#1081.

In bcftools/regidx.h, add prefixes to all functions, as these conflict
with those provided by htslib/htslib/regidx.h. This is done locally
within bcftools (rather than via import/pysam.h) as this issue may
be resolved in future bcftools imports by PR samtools/bcftools#865.
jmarshall added a commit to jmarshall/pysam that referenced this pull request Mar 2, 2022
Exclude samtools/bam2bcf.[ch] which (starting in samtools 1.15) are only
used by bam_tview.c (which we already exclude) and contain functions that
collide with bcftools. Remove obsolete exclusions for removed items.

In import/pysam.h, add prefixes to several more functions that otherwise
conflict between libcsamtools and libcbcftools. Fixes pysam-developers#1081.

In bcftools/regidx.h, add prefixes to all functions, as these conflict
with those provided by htslib/htslib/regidx.h. This is done locally
within bcftools (rather than via import/pysam.h) as this issue may
be resolved in future bcftools imports by PR samtools/bcftools#865.
jmarshall added a commit to jmarshall/pysam that referenced this pull request Mar 3, 2022
Exclude samtools/bam2bcf.[ch] which (starting in samtools 1.15) are only
used by bam_tview.c (which we already exclude) and contain functions that
collide with bcftools. Remove obsolete exclusions for removed items.

In import/pysam.h, add prefixes to several more functions that otherwise
conflict between libcsamtools and libcbcftools. Fixes pysam-developers#1081.

In bcftools/regidx.h, add prefixes to all functions, as these conflict
with those provided by htslib/htslib/regidx.h. This is done locally
within bcftools (rather than via import/pysam.h) as this issue may
be resolved in future bcftools imports by PR samtools/bcftools#865.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant