8304291: [AIX] Broken build after JDK-8301998
Reviewed-by: mdoerr, tsteele, prr
This commit is contained in:
parent
64ed816ad9
commit
310aa93478
src/java.desktop/share/native/libharfbuzz
@ -875,7 +875,8 @@ hb_in_ranges (T u, T lo1, T hi1, Ts... ds)
|
||||
static inline bool
|
||||
hb_unsigned_mul_overflows (unsigned int count, unsigned int size, unsigned *result = nullptr)
|
||||
{
|
||||
#if (defined(__GNUC__) && (__GNUC__ >= 4)) || (defined(__clang__) && (__clang_major__ >= 8))
|
||||
/* avoid with xlc16 clang on AIX; it sets the gcc macros */
|
||||
#if (defined(__GNUC__) && !defined(AIX) && (__GNUC__ >= 4)) || (defined(__clang__) && (__clang_major__ >= 8))
|
||||
unsigned stack_result;
|
||||
if (!result)
|
||||
result = &stack_result;
|
||||
|
@ -43,7 +43,11 @@
|
||||
#include "OT/Color/sbix/sbix.hh"
|
||||
#include "hb-ot-os2-table.hh"
|
||||
#include "hb-ot-post-table.hh"
|
||||
|
||||
#if !defined(AIX)
|
||||
#include "hb-ot-post-table-v2subset.hh"
|
||||
#endif
|
||||
|
||||
#include "hb-ot-cff1-table.hh"
|
||||
#include "hb-ot-cff2-table.hh"
|
||||
#include "hb-ot-vorg-table.hh"
|
||||
|
Loading…
x
Reference in New Issue
Block a user