Changeset: 14446cded12c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14446cded12c Modified Files: sql/backends/monet5/vaults/bam/bam_export.c sql/backends/monet5/vaults/bam/bam_wrapper.c sql/backends/monet5/vaults/bam/bam_wrapper.h Branch: default Log Message:
Backed out changeset 12b79a4dc988: incorrect fix. diffs (36 lines): diff --git a/sql/backends/monet5/vaults/bam/bam_export.c b/sql/backends/monet5/vaults/bam/bam_export.c --- a/sql/backends/monet5/vaults/bam/bam_export.c +++ b/sql/backends/monet5/vaults/bam/bam_export.c @@ -16,7 +16,7 @@ #include "monetdb_config.h" -#ifdef HAVE_SAMTOOLS +#ifdef HAVE_SAMTOOLS_SAM_H #include <samtools/bam.h> #else #include <bam/bam.h> diff --git a/sql/backends/monet5/vaults/bam/bam_wrapper.c b/sql/backends/monet5/vaults/bam/bam_wrapper.c --- a/sql/backends/monet5/vaults/bam/bam_wrapper.c +++ b/sql/backends/monet5/vaults/bam/bam_wrapper.c @@ -15,7 +15,7 @@ #include "stream.h" #include "bam_globals.h" -#ifdef HAVE_SAMTOOLS +#ifdef HAVE_SAMTOOLS_SAM_H #include <samtools/sam.h> #else #include <bam/sam.h> diff --git a/sql/backends/monet5/vaults/bam/bam_wrapper.h b/sql/backends/monet5/vaults/bam/bam_wrapper.h --- a/sql/backends/monet5/vaults/bam/bam_wrapper.h +++ b/sql/backends/monet5/vaults/bam/bam_wrapper.h @@ -18,7 +18,7 @@ #include "gdk.h" -#ifdef HAVE_SAMTOOLS +#ifdef HAVE_SAMTOOLS_SAM_H #include <samtools/sam.h> #else #include <bam/sam.h> _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list