Make ksort.h use hts_defs.h instead of hts.h for HTSLIB_EXPORT

Revised implementation of b5cc0b7, suggested by John Marshall. See also #1497
samtools · Aug 16, 2022 · ce7e298 · ce7e298
1 parent ecc3d0f
commit ce7e298
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/htslib/ksort.h b/htslib/ksort.h
@@ -64,7 +64,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "hts.h"
+#include "hts_defs.h"
 
 #ifndef klib_unused
 #if (defined __clang__ && __clang_major__ >= 3) || (defined __GNUC__ && __GNUC__ >= 3)

diff --git a/htslib_vars.mk b/htslib_vars.mk
@@ -42,7 +42,7 @@ htslib_khash_str2int_h = $(HTSPREFIX)htslib/khash_str2int.h $(htslib_khash_h)
 htslib_klist_h = $(HTSPREFIX)htslib/klist.h
 htslib_kroundup_h = $(HTSPREFIX)htslib/kroundup.h
 htslib_kseq_h = $(HTSPREFIX)htslib/kseq.h
-htslib_ksort_h = $(HTSPREFIX)htslib/ksort.h $(htslib_hts_h)
+htslib_ksort_h = $(HTSPREFIX)htslib/ksort.h $(htslib_hts_defs_h)
 htslib_kstring_h = $(HTSPREFIX)htslib/kstring.h $(htslib_hts_defs_h) $(htslib_kroundup_h)
 htslib_regidx_h = $(HTSPREFIX)htslib/regidx.h $(htslib_hts_h)
 htslib_sam_h = $(HTSPREFIX)htslib/sam.h $(htslib_hts_h) $(htslib_hts_endian_h)