[kaffe] Re: CVS kaffe (dalibor): Only include XShm.h if it exists

[Dalibor Topic]

Riccardo wrote:
>>Log:
>>Only include XShm.h if it exists
> 
> 
> the build still breaks:
> In file included from ../../../../../kaffe/libraries/clib/awt/X/tlk.c:14:
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:113: parse error 
> before `XShmSegmentInfo'
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:113: warning: no 
> semicolon at end of struct or union
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:116: parse error 
> before `*'
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:116: warning: type 
> defaults to `int' in declaration of `shmiMask'
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:116: warning: data 
> definition has no type or storage class
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:127: parse error 
> before `}'
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:127: warning: type 
> defaults to `int' in declaration of `Image'
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:127: warning: data 
> definition has no type or storage class
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:376: parse error 
> before `Image'
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:376: warning: 
> function declaration isn't a prototype
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:506: parse error 
> before `*'
> ./../../../../kaffe/libraries/clib/awt/X/toolkit.h:506: warning: 
> declaration of `width' shadows global declaration
> 
> <CUT>
> 
> It seems that not including the Xshm.h when 
> checking for X11/extensions/XShm.h... (cached) no
> is not enough.
> 
> 
> I have Xsh now installed as an optional package in /opt together with 
> the other X headers. I made symlinks to /usr/include/X11. I reconfigure 
> and try again.

Hi Riccardo,

in order to make the code work, it would be better, in my opinion, to 
guard statements that make use of XShm functionality with the 
appropriate guard condition used for the header file.

So whereever you see a parse error stemming from the missing XShm file, 
please wrap the offending code in the #if defined(...XSHM) /#endif. 
Please repeat untill you get no more errors. When you are finished, 
please submit a patch.

cheers,
dalibor topic