--- old/src/java.desktop/unix/native/common/awt/awt_Font.c	2016-06-23 12:14:24.400348768 +0530
+++ new/src/java.desktop/unix/native/common/awt/awt_Font.c	2016-06-23 12:14:24.220348768 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -638,7 +638,7 @@
 
             /* XXX: sometimes XLoadQueryFont returns a bogus font structure */
             /* with negative ascent. */
-            if (xfont == (Font) NULL || xfont->ascent < 0) {
+            if (xfont == NULL || xfont->ascent < 0) {
                 if (xfont != NULL) {
                     XFreeFont(display, xfont);
                 }
@@ -709,7 +709,7 @@
     Display *display = XDISPLAY;
 
     AWT_LOCK();
-    fdata = (struct FontData *)pData;
+    fdata = (struct FontData *) jlong_to_ptr(pData);
 
     if (fdata == NULL) {
         AWT_UNLOCK();