diff --git a/src/Makefile.sources b/src/Makefile.sources index 57875213188c4ba986cd7c6841624c788645d732..67a3ff6b3906c4800e7a510ef3dd44c364ece2c8 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -9,6 +9,7 @@ HB_BASE_sources = \ hb-buffer-serialize.cc \ hb-buffer.cc \ hb-common.cc \ + hb-dsalgs.hh \ hb-face-private.hh \ hb-face.cc \ hb-font-private.hh \ @@ -40,7 +41,6 @@ HB_BASE_sources = \ hb-shaper-impl-private.hh \ hb-shaper-private.hh \ hb-shaper.cc \ - hb-sort-r.hh \ hb-string-array.hh \ hb-unicode-private.hh \ hb-unicode.cc \ diff --git a/src/hb-sort-r.hh b/src/hb-dsalgs.hh similarity index 94% rename from src/hb-sort-r.hh rename to src/hb-dsalgs.hh index b4c3c91de097f071152cbacd6afcdbdd6b372a4f..e41384754e480e141c488e637e19c2c438b207bc 100644 --- a/src/hb-sort-r.hh +++ b/src/hb-dsalgs.hh @@ -24,17 +24,17 @@ * Google Author(s): Behdad Esfahbod */ -#ifndef HB_SORT_R_HH -#define HB_SORT_R_HH +#ifndef HB_DSALGS_HH +#define HB_DSALGS_HH #include "hb-private.hh" static inline void * -hb_bsearch_r(const void *key, const void *base, - size_t nmemb, size_t size, - int (*compar)(const void *_key, const void *_item, void *_arg), - void *arg) +hb_bsearch_r (const void *key, const void *base, + size_t nmemb, size_t size, + int (*compar)(const void *_key, const void *_item, void *_arg), + void *arg) { int min = 0, max = (int) nmemb - 1; while (min <= max) @@ -158,4 +158,4 @@ static inline void hb_sort_r(void *base, size_t nel, size_t width, sort_r_simple(base, nel, width, compar, arg); } -#endif /* HB_SORT_R_HH */ +#endif /* HB_DSALGS_HH */ diff --git a/src/hb-ot-post-table.hh b/src/hb-ot-post-table.hh index 580a6a92c88183333e9b377dcd90495029bd4436..01d626bf1deb06dc6dbde25dacf027ccfc5fa965 100644 --- a/src/hb-ot-post-table.hh +++ b/src/hb-ot-post-table.hh @@ -28,7 +28,7 @@ #define HB_OT_POST_TABLE_HH #include "hb-open-type-private.hh" -#include "hb-sort-r.hh" +#include "hb-dsalgs.hh" #define HB_STRING_ARRAY_NAME format1_names #define HB_STRING_ARRAY_LIST "hb-ot-post-macroman.hh"