[patch] Allow compiling against newer X11 headers

[Mark Wielaard]

Hi Vlastimil,

On Mon, 2009-11-02 at 22:06 +0100, Vlastimil Babka wrote:
> Sure, why not. I just included it in the .c file because the .h file
> didn't use the constant and I hoped to minimize potential symbol
> collisions or something (suspected something like that could be the
> reason for the weird Fedora patch).

I also couldn't find a reason to define these directly instead of
through including both headers if necessary.

> I don't know about versioning defines, but maybe the simple test Diego
> suggested on our IRC channel could work in this case?
> 
> #include <XShm.h>
> #ifndef X_ShmAttach
> #include <X11/Xmd.h>
> #include <X11/extensions/shmproto.h>
> #endif

That is much nicer and simpler than my approach. And it works fine for
my setups (Fedora 11 and rawhide) Thanks. I committed it as:

2009-11-02  Mark Wielaard  <mjw at redhat.com>
	    Vlastimil Babka  <caster at gentoo.org>

    * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-xshm.patch
    * patches/icedtea-xshm.patch: New patch.
    * HACKING: Document new patch.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: shm.patch
Type: text/x-patch
Size: 992 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091103/08b44162/shm.patch