From d45297718d40d317ee777cd94ee530a277060517 Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <andrew@openjdk.org>
Date: Tue, 3 Nov 2009 23:23:15 +0000
Subject: [PATCH] 6897844: Fix broken build on newer versions of X11 (libXext
 >= 1.1.0)

Recent changes to X11's header structure break the build

Reviewed-by: prr, flar
---
 jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
index 224c5540444..330b605143d 100644
--- a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
+++ b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
@@ -42,6 +42,10 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
+#ifndef X_ShmAttach
+#include <X11/Xmd.h>
+#include <X11/extensions/shmproto.h>
+#endif
 
 extern int XShmQueryExtension();