swrast dri driver loader tries to include drm.h ... breaks Xquarts build

[Jeremy Huddleston]

Thanks George.  That pretty much took care of it... I use __APPLE__  
for now in case anyone wants to debate what the proper symbol should  
be for that...

I'm also having a bit of trouble getting mesa master's glx/x11 to  
compile on OSX.  I committed some fixes just now, but I'm stuck here:

dri2.c:40:21: error: xf86drm.h: No such file or directory
In file included from dri2.c:41:
dri2.h:44: error: syntax error before ‘drm_magic_t’
dri2.c:156: error: syntax error before ‘drm_magic_t’
dri2.c: In function ‘DRI2AuthConnection’:
dri2.c:158: error: ‘dpy’ undeclared (first use in this function)
dri2.c:158: error: (Each undeclared identifier is reported only once
dri2.c:158: error: for each function it appears in.)
dri2.c:168: error: ‘screen’ undeclared (first use in this function)
dri2.c:169: error: ‘magic’ undeclared (first use in this function)

The file is #including "xf86drm.h" , so it looks like it's supposed to  
be a local file... is it just sitting in someone's git repo  
uncommitted?  Or am I missing something?  If it is part of libdrm,  
then it should be included using <>... and we should also have some  
protection in place.

--Jeremy

On Aug 7, 2008, at 01:07, George Sapountzis wrote:
> There is also an indirect include of drm.h from dri_interface.h. It is
> for type definitions only and some ifdef ugliness along the following
> lines is probably needed:
>
> +#ifndef __NOT_HAVE_DRM_H
> #include <drm.h>
> +#else
> +typedef unsigned int drm_context_t;
> +typedef unsigned int drm_drawable_t;
> +typedef struct drm_clip_rect drm_clip_rect_t;
> +#endif
>
> regards,
> George.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3040 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20080808/d84d1a1e/attachment.bin>