jdk-sandbox: comparison jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh

equal deleted inserted replaced

-:49d6193f196f
+:553eb1a50733
 #else
 #define likely(expr) (expr)
 #define unlikely(expr) (expr)
 #endif
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(__clang__)
 #undef __attribute__
 #define __attribute__(x)
 #endif
 #if __GNUC__ >= 3
 #define HB_FUNC __PRETTY_FUNCTION__
 #elif defined(_MSC_VER)
 #define HB_FUNC __FUNCSIG__
 #else
 #define HB_FUNC __func__
+#endif
+/*
+* Borrowed from https://bugzilla.mozilla.org/show_bug.cgi?id=1215411
+* HB_FALLTHROUGH is an annotation to suppress compiler warnings about switch
+* cases that fall through without a break or return statement. HB_FALLTHROUGH
+* is only needed on cases that have code:
+*
+* switch (foo) {
+*   case 1: // These cases have no code. No fallthrough annotations are needed.
+*   case 2:
+*   case 3:
+*     foo = 4; // This case has code, so a fallthrough annotation is needed:
+*     HB_FALLTHROUGH;
+*   default:
+*     return foo;
+* }
+*/
+#if defined(__clang__) && __cplusplus >= 201103L
+/* clang's fallthrough annotations are only available starting in C++11. */
+#  define HB_FALLTHROUGH [[clang::fallthrough]]
+#elif defined(_MSC_VER)
+/*
+* MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
+* https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
+*/
+#  include <sal.h>
+#  define HB_FALLTHROUGH __fallthrough
+#else
+#  define HB_FALLTHROUGH /* FALLTHROUGH */
 #endif
 #if defined(_WIN32) || defined(__CYGWIN__)
 /* We need Windows Vista for both Uniscribe backend and for
 * MemoryBarrier.  We don't support compiling on Windows XP,
 #  endif
 #  if defined(_WIN32_WCE)
 /* Some things not defined on Windows CE. */
 #    define strdup _strdup
+#    define vsnprintf _vsnprintf
 #    define getenv(Name) NULL
 #    if _WIN32_WCE < 0x800
 #      define setlocale(Category, Locale) "C"
 static int errno = 0; /* Use something better? */
 #    endif
 #  elif defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
 #    define getenv(Name) NULL
 #  endif
 #  if defined(_MSC_VER) && _MSC_VER < 1900
 #    define snprintf _snprintf
+#  elif defined(_MSC_VER) && _MSC_VER >= 1900
+#    /* Covers VC++ Error for strdup being a deprecated POSIX name and to instead use _strdup instead */
+#    define strdup _strdup
 #  endif
 #endif
 #if HAVE_ATEXIT
 /* atexit() is only safe to be called from shared libraries on certain
 #define _ASSERT_STATIC1(_line, _cond)   HB_UNUSED typedef int _static_assert_on_line_##_line##_failed[(_cond)?1:-1]
 #define _ASSERT_STATIC0(_line, _cond)   _ASSERT_STATIC1 (_line, (_cond))
 #define ASSERT_STATIC(_cond)            _ASSERT_STATIC0 (__LINE__, (_cond))
-/* Note: C++ allows sizeof() of variable-lengh arrays.  So, if _cond is not
+template <unsigned int cond> class hb_assert_constant_t {};
-* constant, it still compiles (ouch!), but at least we'll get a -Wvla warning. */
-#define ASSERT_STATIC_EXPR_ZERO(_cond) (0 * sizeof (char[(_cond) ? 1 : -1]))
+#define ASSERT_STATIC_EXPR_ZERO(_cond) (0 * (unsigned int) sizeof (hb_assert_constant_t<_cond>))
 #define _PASTE1(a,b) a##b
 #define PASTE(a,b) _PASTE1(a,b)
 /* Lets assert int types.  Saves trouble down the road. */
 /* Debug */
+/* HB_NDEBUG disables some sanity checks that are very safe to disable and
+* should be disabled in production systems.  If NDEBUG is defined, enable
+* HB_NDEBUG; but if it's desirable that normal assert()s (which are very
+* light-weight) to be enabled, then HB_DEBUG can be defined to disable
+* the costlier checks. */
+#ifdef NDEBUG
+#define HB_NDEBUG
+#endif
 #ifndef HB_DEBUG
 #define HB_DEBUG 0
 #endif
 static inline bool
 {
 return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2) || hb_in_range (u, lo3, hi3);
 }
+/* Enable bitwise ops on enums marked as flags_t */
+/* To my surprise, looks like the function resolver is happy to silently cast
+* one enum to another...  So this doesn't provide the type-checking that I
+* originally had in mind... :(.
+*
+* For MSVC warnings, see: https://github.com/behdad/harfbuzz/pull/163
+*/
+#ifdef _MSC_VER
+# pragma warning(disable:4200)
+# pragma warning(disable:4800)
+#endif
+#define HB_MARK_AS_FLAG_T(T) \
+extern "C++" { \
+static inline T operator | (T l, T r) { return T ((unsigned) l | (unsigned) r); } \
+static inline T operator & (T l, T r) { return T ((unsigned) l & (unsigned) r); } \
+static inline T operator ^ (T l, T r) { return T ((unsigned) l ^ (unsigned) r); } \
+static inline T operator ~ (T r) { return T (~(unsigned int) r); } \
+static inline T& operator |= (T &l, T r) { l = l | r; return l; } \
+static inline T& operator &= (T& l, T r) { l = l & r; return l; } \
+static inline T& operator ^= (T& l, T r) { l = l ^ r; return l; } \
+}
 /* Useful for set-operations on small enums.
 * For example, for testing "x ∈ {x1, x2, x3}" use:
 * (FLAG_SAFE(x) & (FLAG(x1) | FLAG(x2) | FLAG(x3)))
 */
 #define FLAG(x) (ASSERT_STATIC_EXPR_ZERO ((x) < 32) + (1U << (x)))
 _hb_options_init ();
 return _hb_options.opts;
 }
+/* Size signifying variable-sized array */
+#define VAR 1
 #endif /* HB_PRIVATE_HH */

changeset 40435	553eb1a50733
parent 34414	e496a8d8fc8a
child 43232	8e39ad39979f