diff options
| author | ztamas@inf.u-szeged.hu <ztamas@inf.u-szeged.hu> | 2019-06-17 16:59:44 +0200 |
|---|---|---|
| committer | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2019-06-18 13:26:06 +0000 |
| commit | 574ef840a1e6d9c3f53ac663473dd39057154539 (patch) | |
| tree | 78a9891b8f94c1cbc7da11148e72edc177081f62 | |
| parent | b95b43a8b2ed121fb12428f55c52cd3e56c10618 (diff) | |
| download | qtwebengine-chromium-574ef840a1e6d9c3f53ac663473dd39057154539.tar.gz | |
[harfbuzz-ng] Remove round polyfill
Cherry-pick to fix MSVC builds
Change-Id: I1ad38579162aecb6867c8f82b5157815d4ad06ee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/harfbuzz-ng/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | chromium/third_party/harfbuzz-ng/src/configure.ac | 5 | ||||
| -rw-r--r-- | chromium/third_party/harfbuzz-ng/src/src/hb.hh | 14 |
3 files changed, 1 insertions, 20 deletions
diff --git a/chromium/third_party/harfbuzz-ng/src/CMakeLists.txt b/chromium/third_party/harfbuzz-ng/src/CMakeLists.txt index f64f96d1cae..dd72ac2c2e9 100644 --- a/chromium/third_party/harfbuzz-ng/src/CMakeLists.txt +++ b/chromium/third_party/harfbuzz-ng/src/CMakeLists.txt @@ -110,7 +110,7 @@ endmacro () if (UNIX) list(APPEND CMAKE_REQUIRED_LIBRARIES m) endif () -check_funcs(atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l round) +check_funcs(atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l) check_include_file(unistd.h HAVE_UNISTD_H) if (${HAVE_UNISTD_H}) add_definitions(-DHAVE_UNISTD_H) diff --git a/chromium/third_party/harfbuzz-ng/src/configure.ac b/chromium/third_party/harfbuzz-ng/src/configure.ac index 98e9c32d818..c226ca4ba1a 100644 --- a/chromium/third_party/harfbuzz-ng/src/configure.ac +++ b/chromium/third_party/harfbuzz-ng/src/configure.ac @@ -79,11 +79,6 @@ GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) # Functions and headers AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l posix_memalign) -save_libs="$LIBS" -LIBS="$LIBS -lm" -AC_CHECK_FUNCS([round], ,[AC_CHECK_DECLS([round], , ,[#include <math.h>])]) -LIBS="$save_libs" - AC_CHECK_HEADERS(unistd.h sys/mman.h xlocale.h stdbool.h) # Compiler flags diff --git a/chromium/third_party/harfbuzz-ng/src/src/hb.hh b/chromium/third_party/harfbuzz-ng/src/src/hb.hh index 896b5902529..5f4a8bad51a 100644 --- a/chromium/third_party/harfbuzz-ng/src/src/hb.hh +++ b/chromium/third_party/harfbuzz-ng/src/src/hb.hh @@ -513,20 +513,6 @@ typedef uint64_t hb_vector_size_impl_t; #define VAR 1 -/* fallback for round() */ -static inline double -_hb_round (double x) -{ - if (x >= 0) - return floor (x + 0.5); - else - return ceil (x - 0.5); -} -#if !defined (HAVE_ROUND) && !defined (HAVE_DECL_ROUND) -#define round(x) _hb_round(x) -#endif - - /* fallback for posix_memalign() */ static inline int _hb_memalign(void **memptr, size_t alignment, size_t size) |