infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-29 01:00:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

8204509: Fix compilation error in harfbuzz 1.7.6 for Solaris Developer Studio 12.6

Browse Source 
Reviewed-by: serb
This commit is contained in:
Phil Race 2018-06-10 18:04:43 -07:00
parent dfb3e113cf
commit 91e6e8f36f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc
View File

@ -117,9 +117,6 @@ _hb_face_for_data_closure_create (hb_blob_t *blob, unsigned int index)
return closure;
}
#ifdef __SUNPRO_CC
extern "C" {
#endif
static void
_hb_face_for_data_closure_destroy (void *data)
{
@ -128,9 +125,6 @@ _hb_face_for_data_closure_destroy (void *data)
hb_blob_destroy (closure->blob);
free (closure);
}
#ifdef __SUNPRO_CC
}
#endif
static hb_blob_t *
_hb_face_for_data_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data)
@ -496,7 +490,7 @@ hb_face_get_table_tags (hb_face_t *face,
unsigned int *table_count, /* IN/OUT */
hb_tag_t *table_tags /* OUT */)
{
if (face->destroy != _hb_face_for_data_closure_destroy)
if (face->destroy != (hb_destroy_func_t) _hb_face_for_data_closure_destroy)
{
if (table_count)
*table_count = 0;

2
src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh
View File

@ -139,7 +139,7 @@ extern "C" void hb_free_impl(void *ptr);
#define HB_FUNC __func__
#endif
#ifdef __SUNPRO_CC
#if defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5140)
/* https://github.com/harfbuzz/harfbuzz/issues/630 */
#define __restrict
#endif