--- old/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c	2016-06-23 12:14:26.272348768 +0530
+++ new/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c	2016-06-23 12:14:26.092348768 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -222,7 +222,7 @@
         return;
     }
 
-    xgc = (GC)gc;
+    xgc = (GC) jlong_to_ptr(gc);
     if (xgc == NULL) {
         return;
     }