<AWT Dev> 6839999: Cumulative fix for 6762511 and 6838003

[Andrew John Hughes]

2009/6/15 Andrew John Hughes <gnu_andrew at member.fsf.org>:
> The changeset http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/315f315b8d3c
> moves a number of definitions copied from
> /usr/include/X11/extensions/Xrender.h from awt_GraphicsEnv.c to
> awt_p.h.  This causes a conflict with the code from the XRender
> project (http://openjdk.java.net/projects/xrender/) which uses the
> proper X11 header, leading to these structures being defined twice.
>
> /usr/include/X11/extensions/Xrender.h:44: error: conflicting types for
> 'XRenderDirectFormat'
> ../../../src/solaris/native/sun/awt/awt_p.h:139: note: previous
> declaration of 'XRenderDirectFormat' was here
> /usr/include/X11/extensions/Xrender.h:52: error: conflicting types for
> 'XRenderPictFormat'
> ../../../src/solaris/native/sun/awt/awt_p.h:147: note: previous
> declaration of 'XRenderPictFormat' was here
>
> Is it really necessary to include a chunk of the header file rather
> than just doing a #include?  If so, may I suggest that the block is
> dependent on _XRENDER_H_ not being defined?
> --
> Andrew :-)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> Support Free Java!
> Contribute to GNU Classpath and the OpenJDK
> http://www.gnu.org/software/classpath
> http://openjdk.java.net
>
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>

Here's a webrev that fixes it by just using the xrender header:

http://fuseyism.com/xrender/webrev.01/

It does mean the header has to be available at build time, but dlsym
is still used to make it optional at runtime.
Given the XRender project is going to be merged at some point anyway,
this hardly seems like a huge sacrifice.

Ok to commit?
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8