Rename hb-sort-r.hh -> hb-dsalgs.hh

This commit is contained in:
Behdad Esfahbod 2017-10-31 15:34:01 -06:00
parent 8eaff980fc
commit 7ce9f397d1
3 changed files with 9 additions and 9 deletions

View File

@ -9,6 +9,7 @@ HB_BASE_sources = \
hb-buffer-serialize.cc \ hb-buffer-serialize.cc \
hb-buffer.cc \ hb-buffer.cc \
hb-common.cc \ hb-common.cc \
hb-dsalgs.hh \
hb-face-private.hh \ hb-face-private.hh \
hb-face.cc \ hb-face.cc \
hb-font-private.hh \ hb-font-private.hh \
@ -40,7 +41,6 @@ HB_BASE_sources = \
hb-shaper-impl-private.hh \ hb-shaper-impl-private.hh \
hb-shaper-private.hh \ hb-shaper-private.hh \
hb-shaper.cc \ hb-shaper.cc \
hb-sort-r.hh \
hb-string-array.hh \ hb-string-array.hh \
hb-unicode-private.hh \ hb-unicode-private.hh \
hb-unicode.cc \ hb-unicode.cc \

View File

@ -24,17 +24,17 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#ifndef HB_SORT_R_HH #ifndef HB_DSALGS_HH
#define HB_SORT_R_HH #define HB_DSALGS_HH
#include "hb-private.hh" #include "hb-private.hh"
static inline void * static inline void *
hb_bsearch_r(const void *key, const void *base, hb_bsearch_r (const void *key, const void *base,
size_t nmemb, size_t size, size_t nmemb, size_t size,
int (*compar)(const void *_key, const void *_item, void *_arg), int (*compar)(const void *_key, const void *_item, void *_arg),
void *arg) void *arg)
{ {
int min = 0, max = (int) nmemb - 1; int min = 0, max = (int) nmemb - 1;
while (min <= max) 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); sort_r_simple(base, nel, width, compar, arg);
} }
#endif /* HB_SORT_R_HH */ #endif /* HB_DSALGS_HH */

View File

@ -28,7 +28,7 @@
#define HB_OT_POST_TABLE_HH #define HB_OT_POST_TABLE_HH
#include "hb-open-type-private.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_NAME format1_names
#define HB_STRING_ARRAY_LIST "hb-ot-post-macroman.hh" #define HB_STRING_ARRAY_LIST "hb-ot-post-macroman.hh"